From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 1 Dec 2004 17:34:23 +0000 (+0000)
Subject: When closed, highlightSearchResults( null )
X-Git-Tag: Release_2_0~881
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c3be701f976c483c37d31179bc1c5dc7c40b707e;p=jalview.git

When closed, highlightSearchResults( null )
---

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index c5a2cf4..a819a18 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -61,8 +61,10 @@ public class Finder extends GFinder
   public void cancel_actionPerformed(ActionEvent e)
   {
     try{
+      // if allResults is null, this effectively switches displaySearch flag in seqCanvas
+      ap.highlightSearchResults( null );
       frame.setClosed(true);
-    }catch(Exception ex){}
+    }catch(Exception ex){ }
 
   }
 
@@ -112,8 +114,6 @@ public class Finder extends GFinder
       for(int i=0; i<searchResults.size(); i++)
         allResults[i] = Integer.parseInt(searchResults.get(i).toString());
 
-
-      ap.highlightSearchResults( allResults );
     }
     else
     {
@@ -123,6 +123,9 @@ public class Finder extends GFinder
       seqIndex=0;
     }
 
+    // if allResults is null, this effectively switches displaySearch flag in seqCanvas
+    ap.highlightSearchResults( allResults );
+
 
   }