From: jprocter <Jim Procter>
Date: Fri, 14 May 2010 14:34:06 +0000 (+0000)
Subject: partial patch for * JAL-466
X-Git-Tag: Release_2_5_1~41
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5f7810e6c809dbc218fed92b811999807dec148a;hp=b8138e12c481f46e969570fa11ef8409aaa31a15;p=jalview.git

partial patch for * JAL-466
allows finder to be instantiated for an explicit alignment panel and viewport.
---

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index e211e3e..5aed688 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -58,6 +58,14 @@ 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);
@@ -95,14 +103,28 @@ public class Finder extends GFinder
       doSearch(true);
     }
   }
+  /**
+   * do we only search a given alignment view ?
+   */
+  private boolean focusfixed;
 
   /**
+   * checks that av and ap are valid, and if not,
    * 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();