X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=3a445a948236029b321bb397ded54d4cec7206bc;hb=c42398f840e2a6709c5ccc45f84de2a12011c90a;hp=ea13c33c90247c4b122019fa8ccd7ecde9f36d32;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index ea13c33..3a445a9 100755
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -115,14 +115,14 @@ public class Finder extends Panel implements ActionListener
 
   void doSearch(boolean findAll)
   {
-    if (jalview.bin.JalviewLite.currentAlignFrame != null)
+    if (ap.av.applet.currentAlignFrame != null)
     {
-      ap = jalview.bin.JalviewLite.currentAlignFrame.alignPanel;
+      ap = ap.av.applet.currentAlignFrame.alignPanel;
       av = ap.av;
     }
     createNewGroup.setEnabled(false);
-    jalview.analysis.Finder finder = new jalview.analysis.Finder(av
-            .getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
+    jalview.analysis.Finder finder = new jalview.analysis.Finder(
+            av.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
     finder.setCaseSensitive(caseSensitive.getState());
     finder.setFindAll(findAll);
 
@@ -166,25 +166,30 @@ public class Finder extends Panel implements ActionListener
       ap.alignFrame.statusBar.setText("Finished searching.");
       resIndex = -1;
       seqIndex = 0;
-    }
-    if (findAll)
-    {
-      String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
-              : "";
-      if (idMatch.size() > 0 && searchResults != null
-              && searchResults.getSize() > 0)
+    } else { 
+      if (findAll)
       {
-        message += " and ";
+        String message = (idMatch.size() > 0) ? "" + idMatch.size()
+                + " IDs" : "";
+        if (idMatch.size() > 0 && searchResults != null
+                && searchResults.getSize() > 0)
+        {
+          message += " and ";
+        }
+        if (searchResults != null)
+        {
+          message += searchResults.getSize() + " subsequence matches.";
+        }
+        ap.alignFrame.statusBar.setText("Search results: " + searchString
+                + " : " + message);
+
       }
-      if (searchResults != null)
+      else
       {
-        message += searchResults.getSize() + " subsequence matches.";
+        // TODO: indicate sequence and matching position in status bar
+        ap.alignFrame.statusBar.setText("Found match for " + searchString);
       }
-      ap.alignFrame.statusBar.setText("Search results: " + searchString
-              + " : " + message);
-
     }
-
   }
 
   Label jLabel1 = new Label();