apply version 2.7 copyright

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

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index eef4b62..5f697ea 100755 (executable)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -115,9 +115,9 @@ 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);
@@ -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();