JAL-3048 code reordered for JalviewJS compliance

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

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 8b5bbda..fd8eb0c 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -227,10 +227,9 @@ public class Finder extends GFinder
               match.getEnd(), desc));
     }
 
-    ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs,
-            features, true, ap, new Runnable()
-            {
-              @Override
+    new FeatureEditor(ap).createFeatures(seqs, features, new Runnable()
+    {
+      @Override
               public void run()
               {
 
@@ -302,6 +301,8 @@ public class Finder extends GFinder
       searchResults = null;
     }
 
+    searchBox.updateCache();
+
     // if allResults is null, this effectively switches displaySearch flag in
     // seqCanvas
     ap.highlightSearchResults(searchResults);
@@ -309,11 +310,11 @@ public class Finder extends GFinder
     // 'SelectRegion' selection
     if (!haveResults)
     {
+      resIndex = -1;
+      seqIndex = 0;
       JvOptionPane.showInternalMessageDialog(this,
               MessageManager.getString("label.finished_searching"), null,
               JvOptionPane.INFORMATION_MESSAGE);
-      resIndex = -1;
-      seqIndex = 0;
     }
     else
     {
@@ -331,13 +332,12 @@ public class Finder extends GFinder
           message += searchResults.getSize()
                   + " subsequence matches found.";
         }
-        JvOptionPane.showInternalMessageDialog(this, message, null,
-                JvOptionPane.INFORMATION_MESSAGE);
         resIndex = -1;
         seqIndex = 0;
+        JvOptionPane.showInternalMessageDialog(this, message, null,
+                JvOptionPane.INFORMATION_MESSAGE);
       }
     }
-    searchBox.updateCache();
   }
 
   /**