From c33c00ea87d553af251435be95f78464fedacabf Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 28 Apr 2005 15:31:43 +0000
Subject: [PATCH] can search ids

---
 src/jalview/gui/Finder.java |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 7483a0a..5a2dfe9 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -13,7 +13,6 @@ public class Finder extends GFinder
   AlignViewport av;
   AlignmentPanel ap;
   JInternalFrame frame;
-  String searchString;
   SuperGroup searchGroup;
 
   int seqIndex = 0;
@@ -67,6 +66,7 @@ public class Finder extends GFinder
     try{
       // if allResults is null, this effectively switches displaySearch flag in seqCanvas
       ap.highlightSearchResults( null );
+      ap.idPanel.highlightSearchResults( null );
      // frame.setClosed(true);
     }catch(Exception ex){ }
   }
@@ -85,7 +85,10 @@ public class Finder extends GFinder
   void doSearch(boolean findAll)
   {
     createNewGroup.setEnabled(false);
-    searchString = textfield.getText().toUpperCase();
+
+    String searchString = textfield.getText().toUpperCase();
+
+    com.stevesoft.pat.Regex regex = new  com.stevesoft.pat.Regex(searchString);
 
     ArrayList searchResults = new ArrayList();
     int [] allResults = null;
@@ -163,7 +166,6 @@ public class Finder extends GFinder
       }
 
 
-      com.stevesoft.pat.Regex regex = new  com.stevesoft.pat.Regex(searchString);
 
       for(int r = resIndex; r<noGaps.length(); r++)
       {
@@ -203,6 +205,18 @@ public class Finder extends GFinder
       }
     }
 
+
+    ArrayList idMatch = new ArrayList();
+    for(int id = 0; id<av.alignment.getHeight(); id++)
+    {
+      if(   regex.search( av.alignment.getSequenceAt(id).getName() ) )
+        idMatch.add( av.alignment.getSequenceAt(id) );
+    }
+
+    if(searchResults.size()==0 && idMatch.size()>0)
+      ap.idPanel.highlightSearchResults( idMatch );
+
+
     if(searchResults.size()>0)
     {
       allResults = new int[searchResults.size()];
-- 
1.7.10.2