From: <ha...@us...> - 2013-10-03 15:17:38
|
Revision: 18778 http://sourceforge.net/p/jmol/code/18778 Author: hansonr Date: 2013-10-03 15:17:33 +0000 (Thu, 03 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/api/ApiPlatform.java trunk/Jmol/src/org/jmol/api/JmolPopupInterface.java trunk/Jmol/src/org/jmol/api/JmolViewer.java trunk/Jmol/src/org/jmol/applet/Jmol.java trunk/Jmol/src/org/jmol/appletjs/Jmol.java trunk/Jmol/src/org/jmol/console/GenericConsole.java trunk/Jmol/src/org/jmol/modelkit/ModelKitPopup.java trunk/Jmol/src/org/jmol/popup/JmolPopup.java trunk/Jmol/src/org/jmol/viewer/ActionManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java Added Paths: ----------- trunk/Jmol/src/org/jmol/api/PlatformViewer.java Modified: trunk/Jmol/src/org/jmol/api/ApiPlatform.java =================================================================== --- trunk/Jmol/src/org/jmol/api/ApiPlatform.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/api/ApiPlatform.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -5,12 +5,10 @@ import org.jmol.util.JmolFont; import org.jmol.util.P3; -import org.jmol.viewer.ActionManager; -import org.jmol.viewer.Viewer; public interface ApiPlatform { - void setViewer(Viewer viewer, Object display); + void setViewer(PlatformViewer viewer, Object display); /////// Display @@ -34,7 +32,7 @@ //// Mouse - JmolMouseInterface getMouseManager(double privateKey, Viewer viewer, ActionManager actionManager); + JmolMouseInterface getMouseManager(double privateKey); ///// Font @@ -113,7 +111,7 @@ */ boolean waitForDisplay(Object boolIsEcho, Object image) throws InterruptedException; - JmolPopupInterface getMenuPopup(Viewer viewer, String menuStructure, char type); + JmolPopupInterface getMenuPopup(String menuStructure, char type); Object getJsObjectInfo(Object[] jsObject, String method, Object[] args); Modified: trunk/Jmol/src/org/jmol/api/JmolPopupInterface.java =================================================================== --- trunk/Jmol/src/org/jmol/api/JmolPopupInterface.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/api/JmolPopupInterface.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -1,13 +1,11 @@ package org.jmol.api; -import org.jmol.viewer.Viewer; - public interface JmolPopupInterface { public void jpiDispose(); public Object jpiGetMenuAsObject(); public String jpiGetMenuAsString(String string); - public void jpiInitialize(Viewer viewer, String menu); + public void jpiInitialize(PlatformViewer viewer, String menu); public void jpiShow(int x, int y); public void jpiUpdateComputedMenus(); Modified: trunk/Jmol/src/org/jmol/api/JmolViewer.java =================================================================== --- trunk/Jmol/src/org/jmol/api/JmolViewer.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/api/JmolViewer.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -304,7 +304,7 @@ abstract public String scriptWait(String script); abstract public Object scriptWaitStatus(String script, String statusList); abstract public String loadInline(String strModel); - abstract public String loadInline(String strModel, boolean isAppend); + abstract public String loadInlineAppend(String strModel, boolean isAppend); abstract public String loadInline(String strModel, char newLine); abstract public String loadInline(String[] arrayModels); /** Added: trunk/Jmol/src/org/jmol/api/PlatformViewer.java =================================================================== --- trunk/Jmol/src/org/jmol/api/PlatformViewer.java (rev 0) +++ trunk/Jmol/src/org/jmol/api/PlatformViewer.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -0,0 +1,7 @@ +package org.jmol.api; + +public interface PlatformViewer { + +// for JSpecView use of apiPlatform + +} Modified: trunk/Jmol/src/org/jmol/applet/Jmol.java =================================================================== --- trunk/Jmol/src/org/jmol/applet/Jmol.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/applet/Jmol.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -745,7 +745,7 @@ } public String loadInlineString(String strModel, String script, boolean isAppend) { - String errMsg = viewer.loadInline(strModel, isAppend); + String errMsg = viewer.loadInlineAppend(strModel, isAppend); if (errMsg == null) script(script); return errMsg; Modified: trunk/Jmol/src/org/jmol/appletjs/Jmol.java =================================================================== --- trunk/Jmol/src/org/jmol/appletjs/Jmol.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/appletjs/Jmol.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -469,7 +469,7 @@ } public String loadInlineString(String strModel, String script, boolean isAppend) { - String errMsg = viewer.loadInline(strModel, isAppend); + String errMsg = viewer.loadInlineAppend(strModel, isAppend); if (errMsg == null) script(script); return errMsg; Modified: trunk/Jmol/src/org/jmol/console/GenericConsole.java =================================================================== --- trunk/Jmol/src/org/jmol/console/GenericConsole.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/console/GenericConsole.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -214,7 +214,7 @@ return; } if (source == loadButton) { - viewer.loadInline(input.getText(), false); + viewer.loadInlineAppend(input.getText(), false); return; } if (isMenuItem(source)) { Modified: trunk/Jmol/src/org/jmol/modelkit/ModelKitPopup.java =================================================================== --- trunk/Jmol/src/org/jmol/modelkit/ModelKitPopup.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/modelkit/ModelKitPopup.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -29,6 +29,7 @@ import javax.swing.JMenuItem; import javax.swing.JOptionPane; +import org.jmol.api.PlatformViewer; import org.jmol.i18n.GT; import org.jmol.popup.PopupResource; import org.jmol.popup.SwingPopup; @@ -41,11 +42,11 @@ // required by reflection } - public void jpiInitialize(Viewer viewer, String menu) { + public void jpiInitialize(PlatformViewer viewer, String menu) { updateMode = UPDATE_NEVER; boolean doTranslate = GT.setDoTranslate(true); PopupResource bundle = new ModelKitPopupResourceBundle(); - initialize(viewer, bundle, bundle.getMenuName()); + initialize((Viewer) viewer, bundle, bundle.getMenuName()); GT.setDoTranslate(doTranslate); } Modified: trunk/Jmol/src/org/jmol/popup/JmolPopup.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/JmolPopup.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/popup/JmolPopup.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -23,6 +23,7 @@ */ package org.jmol.popup; +import org.jmol.api.PlatformViewer; import org.jmol.i18n.GT; import org.jmol.viewer.Viewer; @@ -42,11 +43,11 @@ // required by reflection } - public void jpiInitialize(Viewer viewer, String menu) { + public void jpiInitialize(PlatformViewer viewer, String menu) { boolean doTranslate = GT.setDoTranslate(true); PopupResource bundle = new MainPopupResourceBundle(strMenuStructure = menu, menuText); - initialize(viewer, bundle, bundle.getMenuName()); + initialize((Viewer) viewer, bundle, bundle.getMenuName()); GT.setDoTranslate(doTranslate); } Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -948,13 +948,9 @@ } } - public void mouseEntered(long time, int x, int y) { + public void mouseEnterExit(long time, int x, int y, boolean isExit) { setCurrent(time, x, y, 0); - } - - public void mouseExited(long time, int x, int y) { - setCurrent(time, x, y, 0); - if (measurementPending != null) { + if (isExit && measurementPending != null) { exitMeasurementMode(); viewer.refresh(3, "mouseExit"); } Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -70,6 +70,7 @@ import org.jmol.api.JmolViewer; import org.jmol.api.MepCalculationInterface; import org.jmol.api.MinimizerInterface; +import org.jmol.api.PlatformViewer; import org.jmol.api.SmilesMatcherInterface; import org.jmol.api.SymmetryInterface; import org.jmol.atomdata.AtomData; @@ -177,7 +178,7 @@ */ @J2SIgnoreImport( { Runtime.class }) -public class Viewer extends JmolViewer implements AtomDataServer { +public class Viewer extends JmolViewer implements AtomDataServer, PlatformViewer { @Override protected void finalize() throws Throwable { @@ -191,6 +192,11 @@ public boolean autoExit = false; public boolean haveDisplay = false; + + public boolean hasDisplay() { + return haveDisplay; + } + public boolean isJS, isWebGL; public boolean isSingleThreaded; public boolean queueOnHold = false; @@ -234,6 +240,12 @@ Object applet; // j2s only ActionManager actionManager; + + public ActionManager getActionManager() { + return actionManager; + } + + AnimationManager animationManager; ColorManager colorManager; DataManager dataManager; @@ -501,7 +513,7 @@ : new ActionManager()); actionManager.setViewer(this, commandOptions + "-multitouch-" + info.get("multiTouch")); - mouse = apiPlatform.getMouseManager(privateKey, this, actionManager); + mouse = apiPlatform.getMouseManager(privateKey); if (multiTouch && !checkOption2("-simulated", "-simulated")) apiPlatform.setTransparentCursor(display); } @@ -675,6 +687,7 @@ } public void disposeMouse() { + actionManager.dispose(); mouse.dispose(); mouse = null; } @@ -1828,10 +1841,8 @@ // call before setting viewer=null if (modeMouse == JC.MOUSE_NONE) { // applet is being destroyed - if (mouse != null) { - mouse.dispose(); - mouse = null; - } + if (mouse != null) + disposeMouse(); clearScriptQueue(); clearThreads(); haltScriptExecution(); @@ -2359,7 +2370,7 @@ */ @Override - public String loadInline(String strModel, boolean isAppend) { + public String loadInlineAppend(String strModel, boolean isAppend) { // JmolViewer interface return loadInlineScriptRepaint(strModel, '\0', isAppend); } @@ -4508,7 +4519,7 @@ return evalStringQuietSync(strScript, true, true); } - String evalStringQuietSync(String strScript, boolean isQuiet, + public String evalStringQuietSync(String strScript, boolean isQuiet, boolean allowSyncScript) { return (getScriptManager() == null ? null : scriptManager .evalStringQuietSync(strScript, isQuiet, allowSyncScript)); @@ -5034,7 +5045,7 @@ case 'b': case 'm': // atom, bond, or main -- ignored - modelkitPopup = apiPlatform.getMenuPopup(this, null, type); + modelkitPopup = apiPlatform.getMenuPopup(null, type); if (modelkitPopup != null) modelkitPopup.jpiShow(x, y); break; @@ -5054,8 +5065,7 @@ private Object getPopupMenu() { if (jmolpopup == null) { - jmolpopup = (allowScripting ? apiPlatform.getMenuPopup(this, - menuStructure, 'j') : null); + jmolpopup = (allowScripting ? apiPlatform.getMenuPopup(menuStructure, 'j') : null); if (jmolpopup == null) { global.disablePopupMenu = true; return null; Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2013-10-03 15:16:21 UTC (rev 18777) +++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2013-10-03 15:17:33 UTC (rev 18778) @@ -1111,7 +1111,7 @@ } public void actionPerformed(ActionEvent e) { - viewer.loadInline(viewer.getClipboardText(), false); + viewer.loadInlineAppend(viewer.getClipboardText(), false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |