apply jalview code style

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

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index f9962a6..eef4b62 100755 (executable)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.appletgui;
 
@@ -37,7 +36,7 @@ public class Finder extends Panel implements ActionListener
 
   int seqIndex = 0;
 
-  int resIndex = 0;
+  int resIndex = -1;
 
   public Finder(final AlignmentPanel ap)
   {
@@ -80,7 +79,7 @@ public class Finder extends Panel implements ActionListener
 
     else if (evt.getSource() == findAll)
     {
-      resIndex = 0;
+      resIndex = -1;
       seqIndex = 0;
       doSearch(true);
     }
@@ -122,8 +121,8 @@ public class Finder extends Panel implements ActionListener
       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);
 
@@ -134,34 +133,56 @@ public class Finder extends Panel implements ActionListener
     resIndex = finder.getResIndex();
     searchResults = finder.getSearchResults();
     Vector idMatch = finder.getIdMatch();
-
-    if (searchResults.getSize() == 0 && idMatch.size() > 0)
+    boolean haveResults = false;
+    // set or reset the GUI
+    if ((idMatch.size() > 0))
     {
+      haveResults = true;
       ap.idPanel.highlightSearchResults(idMatch);
     }
+    else
+    {
+      ap.idPanel.highlightSearchResults(null);
+    }
 
     if (searchResults.getSize() > 0)
     {
+      haveResults = true;
       createNewGroup.setEnabled(true);
 
     }
     else
     {
       searchResults = null;
-      resIndex = 0;
-      seqIndex = 0;
     }
 
     // if allResults is null, this effectively switches displaySearch flag in
     // seqCanvas
     ap.highlightSearchResults(searchResults);
-
+    // TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
+    // 'SelectRegion' selection
+    if (!haveResults)
+    {
+      ap.alignFrame.statusBar.setText("Finished searching.");
+      resIndex = -1;
+      seqIndex = 0;
+    }
     if (findAll)
     {
-      String message = (searchResults == null ? 0 : searchResults.getSize())
-              + " matches found.";
+      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);
+
     }
 
   }