From: Bob H. <ha...@us...> - 2006-02-22 04:38:50
|
Update of /cvsroot/jmol/Jmol/src/org/jmol/applet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2918/src/org/jmol/applet Modified Files: Jmol.java Log Message: (1) returns to void applet.script() (2) adds Script applet.scriptNoWait() for testing (3) adds Script applet.scriptCheck() for testing (4) all set if we want to go to frame/model difference, but this is left as is for now. (5) adding NEW keyword in connect, to complement EXISTS -- this allows either choice -- only bonds made where no bond is present; only bonds made where bonds already present (6) adding colix in atomInfo, just for testing purposes. Index: Jmol.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/jmol/applet/Jmol.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Jmol.java 17 Feb 2006 23:28:52 -0000 1.22 +++ Jmol.java 22 Feb 2006 04:38:44 -0000 1.23 @@ -431,10 +431,18 @@ } else { buttonCallbackNotificationPending = false; } - String str = script(script); + script(script); } - synchronized public String script(String script) { + synchronized public void script(String script) { + viewer.script(script); + } + + synchronized public String scriptCheck(String script) { + return viewer.scriptCheck(script); + } + + synchronized public String scriptNoWait(String script) { return viewer.script(script); } @@ -478,7 +486,7 @@ public void loadInline(String strModel, String script) { loadInline(strModel); - String str = script(script); + script(script); } public void loadDOMNode(JSObject DOMNode) { @@ -591,7 +599,7 @@ } public void notifyScriptTermination(String errorMessage, int msWalltime) { - showStatusAndConsole(GT._("Jmol script completed")); + showStatusAndConsole(GT._(errorMessage)); if (buttonCallbackNotificationPending) { System.out.println("!!!! calling back " + buttonCallback); buttonCallbackAfter[0] = buttonName; |