temp push

[jalview.git] / src / jalview / javascript / MouseOverListener.java

diff --git a/src/jalview/javascript/MouseOverListener.java b/src/jalview/javascript/MouseOverListener.java
index 2b228da..7c74965 100644 (file)
--- a/src/jalview/javascript/MouseOverListener.java
+++ b/src/jalview/javascript/MouseOverListener.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,14 +20,14 @@
  */
 package jalview.javascript;
 
+import jalview.api.JalviewApp;
 import jalview.appletgui.AlignFrame;
-import jalview.bin.JalviewLite;
 import jalview.datamodel.SequenceI;
 import jalview.structure.VamsasListener;
 import jalview.structure.VamsasSource;
 
-public class MouseOverListener extends JSFunctionExec implements
-        VamsasListener, JsCallBack
+public class MouseOverListener extends JSFunctionExec
+        implements VamsasListener, JsCallBack
 {
   AlignFrame _af;
 
@@ -48,30 +48,18 @@ public class MouseOverListener extends JSFunctionExec implements
       // + seq + " at " + index);
       last = seq;
       i = index;
-      AlignFrame src = null;
+      Object alignFrame = jvlite.getFrameForSource(source);
       try
       {
-        if (source != null)
-        {
-          if (source instanceof jalview.appletgui.AlignViewport
-                  && ((jalview.appletgui.AlignViewport) source).applet.currentAlignFrame.viewport == source)
-          {
-            // should be valid if it just generated an event!
-            src = ((jalview.appletgui.AlignViewport) source).applet.currentAlignFrame;
-
-          }
-          // TODO: ensure that if '_af' is specified along with a handler
-          // function, then only events from that alignFrame are sent to that
-          // function
-        }
         executeJavascriptFunction(_listener,
-                new Object[] { src, seq.getDisplayId(false), "" + (1 + i),
+                new Object[]
+                { alignFrame, seq.getDisplayId(false), "" + (1 + i),
                     "" + seq.findPosition(i) });
       } catch (Exception ex)
       {
 
-        System.err
-                .println("JalviewLite javascript error: Couldn't send mouseOver with handler '"
+        System.err.println(
+                "JalviewLite javascript error: Couldn't send mouseOver with handler '"
                         + _listener + "'");
         if (ex instanceof netscape.javascript.JSException)
         {
@@ -83,10 +71,10 @@ public class MouseOverListener extends JSFunctionExec implements
     }
   }
 
-  public MouseOverListener(JalviewLite applet, AlignFrame af,
-          String listener)
+  public MouseOverListener(JalviewApp applet, AlignFrame af,
+          String listener, boolean debug)
   {
-    super(applet);
+    super(applet, debug);
     _af = af;
     _listener = listener;
   }