Set fsettings in constuctor

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

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index 570241d..db46177 100755 (executable)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -123,6 +123,11 @@ public class Finder extends Panel implements ActionListener
 \r
   void doSearch(boolean findAll)\r
   {\r
+    if(jalview.bin.JalviewLite.currentAlignFrame!=null)\r
+    {\r
+      ap = jalview.bin.JalviewLite.currentAlignFrame.alignPanel;\r
+      av = ap.av;\r
+    }\r
     createNewGroup.setEnabled(false);\r
 \r
     String searchString = textfield.getText();\r
@@ -143,7 +148,7 @@ public class Finder extends Panel implements ActionListener
       int res = Integer.parseInt(searchString);\r
       found = true;\r
 \r
-      if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize() < 1)\r
+      if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize(false) < 1)\r
       {\r
         seq = (Sequence) av.getAlignment().getSequenceAt(0);\r
       }\r
@@ -166,7 +171,7 @@ public class Finder extends Panel implements ActionListener
     SequenceGroup selection = av.getSelectionGroup();\r
     if (selection != null)\r
     {\r
-      if (selection.getSize() < 1 ||\r
+      if (selection.getSize(false) < 1 ||\r
           (selection.getEndRes() - selection.getStartRes() < 2))\r
       {\r
         selection = null;\r
@@ -178,7 +183,7 @@ public class Finder extends Panel implements ActionListener
 \r
       seq = (Sequence) av.alignment.getSequenceAt(seqIndex);\r
 \r
-      if (selection != null && !selection.sequences.contains(seq))\r
+      if (selection != null && !selection.getSequences(false).contains(seq))\r
       {\r
         seqIndex++;\r
         resIndex = 0;\r