X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=6a8db59b513e17c947747f71d294eaa6e0950c61;hb=af83e7d123133d2bb44b0bcafe538e300304a1b1;hp=e7f2a5346449cfba358ba5cc9afdafc73cf0492c;hpb=2c36850b9eba4ec9a72d6cf749330c9670e73a21;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index e7f2a53..6a8db59 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -45,10 +45,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; @@ -920,7 +922,7 @@ public class JalviewLite extends Applet setMouseoverListener(currentAlignFrame, listener); } - private Vector javascriptListeners = new Vector<>(); + private Vector javascriptListeners = new Vector<>(); /* * (non-Javadoc) @@ -942,7 +944,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) @@ -989,7 +991,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) @@ -1128,7 +1130,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) @@ -1155,7 +1157,7 @@ public class JalviewLite extends Applet StructureSelectionManager.release(this); } - private jalview.javascript.JSFunctionExec jsFunctionExec; + private JSFunctionExec jsFunctionExec; /* * (non-Javadoc) @@ -1230,7 +1232,7 @@ public class JalviewLite extends Applet * (non-Javadoc) * * @see - * jalview.javascript.JalviewLiteJsApi#scrollViewToRowIn(jalview.appletgui + * JalviewLiteJsApi#scrollViewToRowIn(jalview.appletgui * .AlignFrame, java.lang.String) */ @Override @@ -1261,7 +1263,7 @@ public class JalviewLite extends Applet * (non-Javadoc) * * @see - * jalview.javascript.JalviewLiteJsApi#scrollViewToColumnIn(jalview.appletgui + * JalviewLiteJsApi#scrollViewToColumnIn(jalview.appletgui * .AlignFrame, java.lang.String) */ @Override