X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FMouseOverListener.java;h=5b6eeb8da3907937e06c5376bdb1e57e66a16864;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=224c6d6cd5777c7ccd9aa27017e2faf5ba33e151;hpb=caf13e6a9dc82023cd8648420201e5ad60ce0393;p=jalview.git diff --git a/src/jalview/javascript/MouseOverListener.java b/src/jalview/javascript/MouseOverListener.java index 224c6d6..5b6eeb8 100644 --- a/src/jalview/javascript/MouseOverListener.java +++ b/src/jalview/javascript/MouseOverListener.java @@ -1,13 +1,30 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.javascript; -import java.util.Vector; - import jalview.appletgui.AlignFrame; import jalview.bin.JalviewLite; import jalview.datamodel.SequenceI; import jalview.structure.VamsasListener; import jalview.structure.VamsasSource; -import netscape.javascript.JSObject; public class MouseOverListener extends JSFunctionExec implements VamsasListener, JsCallBack @@ -20,7 +37,9 @@ public class MouseOverListener extends JSFunctionExec implements int i = -1; - public void mouseOver(SequenceI seq, int index, VamsasSource source) + @Override + public void mouseOverSequence(SequenceI seq, int index, + VamsasSource source) { if (seq != last || i != index) { @@ -32,7 +51,6 @@ public class MouseOverListener extends JSFunctionExec implements AlignFrame src = null; try { - Vector win; if (source != null) { if (source instanceof jalview.appletgui.AlignViewport @@ -42,9 +60,13 @@ public class MouseOverListener extends JSFunctionExec implements 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) }); + executeJavascriptFunction(_listener, + new Object[] { src, seq.getDisplayId(false), "" + (1 + i), + "" + seq.findPosition(i) }); } catch (Exception ex) {