X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=5fc2a01989c3796edac9520bb936c173b3395d0d;hb=90a1b20c1297ec0d7fc596f89f6323a4b1bc7083;hp=e211e3e52a2004feb95c463df5de9c06e04d9236;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index e211e3e..5fc2a01 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -58,6 +58,15 @@ public class Finder extends GFinder
    */
   public Finder()
   {
+    this(null, null);
+    focusfixed = false;
+  }
+
+  public Finder(AlignViewport viewport, AlignmentPanel alignPanel)
+  {
+    av = viewport;
+    ap = alignPanel;
+    focusfixed = true;
     frame = new JInternalFrame();
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -97,12 +106,28 @@ public class Finder extends GFinder
   }
 
   /**
-   * gets the topmost alignment window and sets av and ap accordingly
+   * do we only search a given alignment view ?
+   */
+  private boolean focusfixed;
+
+  /**
+   * if !focusfixed and not in a desktop environment, checks that av and ap are
+   * valid. Otherwise, gets the topmost alignment window and sets av and ap
+   * accordingly
    * 
    * @return false if no alignment window was found
    */
   boolean getFocusedViewport()
   {
+    if (focusfixed || Desktop.desktop == null)
+    {
+      if (ap != null && av != null)
+      {
+        return true;
+      }
+      // we aren't in a desktop environment, so give up now.
+      return false;
+    }
     // now checks further down the window stack to fix bug
     // https://mantis.lifesci.dundee.ac.uk/view.php?id=36008
     JInternalFrame[] frames = Desktop.desktop.getAllFrames();