works on focused viewport

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

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 8697552..e1431a9 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -54,11 +54,13 @@ public class Finder extends GFinder
      * @param ap DOCUMENT ME!\r
      * @param f DOCUMENT ME!\r
      */\r
-    public Finder(AlignViewport av, AlignmentPanel ap, JInternalFrame f)\r
+    public Finder()\r
     {\r
-        this.av = av;\r
-        this.ap = ap;\r
-        frame = f;\r
+      frame = new JInternalFrame();\r
+      frame.setContentPane(this);\r
+      frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
+      Desktop.addInternalFrame(frame, "Find", 340, 110);\r
+\r
 \r
         // all a big pain, but we need to wait until the frame is visible before the textfield can\r
         // obtain the focus/////////////////////////\r
@@ -85,6 +87,7 @@ public class Finder extends GFinder
      */\r
     public void findNext_actionPerformed(ActionEvent e)\r
     {\r
+      if (getFocusedViewport())\r
         doSearch(false);\r
     }\r
 \r
@@ -95,9 +98,25 @@ public class Finder extends GFinder
      */\r
     public void findAll_actionPerformed(ActionEvent e)\r
     {\r
+      if(getFocusedViewport())\r
+      {\r
         resIndex = 0;\r
         seqIndex = 0;\r
         doSearch(true);\r
+      }\r
+    }\r
+\r
+    boolean getFocusedViewport()\r
+    {\r
+      JInternalFrame frame = Desktop.desktop.getAllFrames()[1];\r
+\r
+      if(frame!=null && frame instanceof AlignFrame)\r
+      {\r
+        av = ((AlignFrame)frame).viewport;\r
+        ap = ((AlignFrame)frame).alignPanel;\r
+        return true;\r
+      }\r
+      return false;\r
     }\r
 \r
 \r