From 49606a763a26d7e130b06078558f079603ea8bae Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 20 Nov 2006 18:07:58 +0000 Subject: [PATCH] look for current alignframe to search --- src/jalview/appletgui/Finder.java | 5 +++++ src/jalview/gui/AlignFrame.java | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index f44a90e..db46177 100755 --- a/src/jalview/appletgui/Finder.java +++ b/src/jalview/appletgui/Finder.java @@ -123,6 +123,11 @@ public class Finder extends Panel implements ActionListener void doSearch(boolean findAll) { + if(jalview.bin.JalviewLite.currentAlignFrame!=null) + { + ap = jalview.bin.JalviewLite.currentAlignFrame.alignPanel; + av = ap.av; + } createNewGroup.setEnabled(false); String searchString = textfield.getText(); diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 42934b9..6aceffc 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -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) -- 1.7.10.2