X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;fp=src%2Fjalview%2Fbin%2FJalviewLite.java;h=3e4c1fe96a68bc794bf9422a5602cdd512813913;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=871ca54bbfb978175979e54f06eb22adb078617d;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index 871ca54..3e4c1fe 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -47,10 +47,12 @@ import jalview.io.IdentifyFile; import jalview.io.JPredFile; import jalview.io.JnetAnnotationMaker; import jalview.io.NewickFile; -import jalview.javascript.JSFunctionExec; -import jalview.javascript.JalviewLiteJsApi; -import jalview.javascript.JsCallBack; -import jalview.javascript.MouseOverStructureListener; +import jalview.appletgui.js.JSFunctionExec; +import jalview.appletgui.js.JalviewLiteJsApi; +import jalview.appletgui.js.JsCallBack; +import jalview.appletgui.js.JsSelectionSender; +import jalview.appletgui.js.MouseOverListener; +import jalview.appletgui.js.MouseOverStructureListener; import jalview.structure.SelectionListener; import jalview.structure.StructureSelectionManager; import jalview.util.ColorUtils; @@ -922,7 +924,7 @@ public class JalviewLite extends Applet setMouseoverListener(currentAlignFrame, listener); } - private Vector javascriptListeners = new Vector<>(); + private Vector javascriptListeners = new Vector<>(); /* * (non-Javadoc) @@ -944,7 +946,7 @@ public class JalviewLite extends Applet return; } } - jalview.javascript.MouseOverListener mol = new jalview.javascript.MouseOverListener( + MouseOverListener mol = new MouseOverListener( this, af, listener); javascriptListeners.addElement(mol); StructureSelectionManager.getStructureSelectionManager(this) @@ -991,7 +993,7 @@ public class JalviewLite extends Applet return; } } - jalview.javascript.JsSelectionSender mol = new jalview.javascript.JsSelectionSender( + JsSelectionSender mol = new JsSelectionSender( this, af, listener); javascriptListeners.addElement(mol); StructureSelectionManager.getStructureSelectionManager(this) @@ -1130,7 +1132,7 @@ public class JalviewLite extends Applet { while (javascriptListeners.size() > 0) { - jalview.javascript.JSFunctionExec mol = javascriptListeners + JSFunctionExec mol = javascriptListeners .elementAt(0); javascriptListeners.removeElement(mol); if (mol instanceof SelectionListener) @@ -1157,7 +1159,7 @@ public class JalviewLite extends Applet StructureSelectionManager.release(this); } - private jalview.javascript.JSFunctionExec jsFunctionExec; + private JSFunctionExec jsFunctionExec; /* * (non-Javadoc) @@ -1232,7 +1234,7 @@ public class JalviewLite extends Applet * (non-Javadoc) * * @see - * jalview.javascript.JalviewLiteJsApi#scrollViewToRowIn(jalview.appletgui + * JalviewLiteJsApi#scrollViewToRowIn(jalview.appletgui * .AlignFrame, java.lang.String) */ @Override @@ -1263,7 +1265,7 @@ public class JalviewLite extends Applet * (non-Javadoc) * * @see - * jalview.javascript.JalviewLiteJsApi#scrollViewToColumnIn(jalview.appletgui + * JalviewLiteJsApi#scrollViewToColumnIn(jalview.appletgui * .AlignFrame, java.lang.String) */ @Override