look for current alignframe to search
authoramwaterhouse <Andrew Waterhouse>
Mon, 20 Nov 2006 18:07:58 +0000 (18:07 +0000)
committeramwaterhouse <Andrew Waterhouse>
Mon, 20 Nov 2006 18:07:58 +0000 (18:07 +0000)
src/jalview/appletgui/Finder.java
src/jalview/gui/AlignFrame.java

index f44a90e..db46177 100755 (executable)
@@ -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
index 42934b9..6aceffc 100755 (executable)
@@ -1708,11 +1708,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   public void findMenuItem_actionPerformed(ActionEvent e)
   {
-    JInternalFrame frame = new JInternalFrame();
-    Finder finder = new Finder(viewport, alignPanel, frame);
-    frame.setContentPane(finder);
-    frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "Find", 340, 110);
+    new Finder();
   }
 
   public void newView_actionPerformed(ActionEvent e)