Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / gui / Finder.java

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 6dacbd8..2756b14 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -108,6 +108,7 @@ public class Finder extends GFinder
     focusFixed = fixedFocus;
     finders = new HashMap<>();
     frame = new JInternalFrame();
+    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<SequenceI> 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();