From: <ha...@us...> - 2008-12-03 17:41:15
|
Revision: 10425 http://jmol.svn.sourceforge.net/jmol/?rev=10425&view=rev Author: hansonr Date: 2008-12-03 17:41:11 +0000 (Wed, 03 Dec 2008) Log Message: ----------- version=11.7.16_dev # new feature: set errorCallback -- cannot be a Jmol script! Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-12-03 17:37:16 UTC (rev 10424) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-12-03 17:41:11 UTC (rev 10425) @@ -275,10 +275,10 @@ this.historyDisabled = historyDisabled; try { try { - instructionDispatchLoop(listCommands); - String script = viewer.getInterruptScript(); - if (script != "") - runScript(script, null); + instructionDispatchLoop(listCommands); + String script = viewer.getInterruptScript(); + if (script != "") + runScript(script, null); } catch (Error er) { viewer.handleError(er, false); setErrorMessage("" + er + " " + viewer.getShapeErrorState()); @@ -287,7 +287,9 @@ } catch (ScriptException e) { setErrorMessage(e.toString()); scriptStatus(errorMessage); - viewer.notifyError("ScriptException", errorMessage); + viewer.notifyError( + (errorMessage.indexOf("java.lang.OutOfMemoryError") >= 0 ? "Error" + : "ScriptException"), errorMessage); } timeEndExecution = System.currentTimeMillis(); fileOpenCheck = tempOpen; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |