X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=f641f4b71d3968626a5b13baa30c4d650f6c6ea5;hb=4468c1e39c57fbb67192207b4c8750dab1b1dedd;hp=6dacbd85a27238db065e0c1137c2de51aa4d9979;hpb=daca035ea0a7379b3f5332aceb19bcb41f7038b3;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 6dacbd8..f641f4b 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -75,7 +75,7 @@ public class Finder extends GFinder private AlignmentPanel ap; - private JInternalFrame frame; + private JalviewInternalFrame frame; /* * Finder agent per viewport searched @@ -107,7 +107,8 @@ public class Finder extends GFinder ap = alignPanel; focusFixed = fixedFocus; finders = new HashMap<>(); - frame = new JInternalFrame(); + frame = new JalviewInternalFrame(); + frame.setFrameIcon(null); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); frame.addInternalFrameListener(new InternalFrameAdapter() @@ -260,28 +261,8 @@ public class Finder extends GFinder { return; // shouldn't happen } - List seqs = new ArrayList<>(); - - String searchString = searchBox.getUserInput(); - String desc = "Search Results"; - - /* - * assemble dataset sequences, and template new sequence features, - * for the amend features dialog - */ - for (SearchResultMatchI match : searchResults.getResults()) - { - SequenceI seq = match.getSequence(); - while (seq.getDatasetSequence() != null) - { - seq = seq.getDatasetSequence(); - } - seqs.add(seq.getSubSequence(seq.findIndex(match.getStart()), - seq.findIndex(match.getEnd()) + 1)); - } - Desktop.jalviewClipboard = new Object[] { - seqs.toArray(new SequenceI[0]), ap.av.getAlignment().getDataset(), - ap.av.getAlignment().getHiddenColumns() }; + // assume viewport controller has same searchResults as we do... + ap.alignFrame.avc.copyHighlightedRegionsToClipboard(); } /** @@ -314,6 +295,7 @@ public class Finder extends GFinder finder = new jalview.analysis.Finder(av); finders.put(av, finder); } + finder.setFeatureRenderer(ap.getFeatureRenderer()); boolean isCaseSensitive = caseSensitive.isSelected(); boolean doSearchDescription = searchDescription.isSelected();