From: <ha...@us...> - 2006-10-24 13:34:42
|
Revision: 6012 http://svn.sourceforge.net/jmol/?rev=6012&view=rev Author: hansonr Date: 2006-10-24 06:34:34 -0700 (Tue, 24 Oct 2006) Log Message: ----------- fix for jmol -ions not exiting with compiler error. Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-10-23 20:41:52 UTC (rev 6011) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-10-24 13:34:34 UTC (rev 6012) @@ -2290,15 +2290,13 @@ String strErrorMessage = eval.getErrorMessage(); int msWalltime = eval.getExecutionWalltime(); statusManager.setStatusScriptTermination(strErrorMessage, msWalltime); - if (isScriptFile) { - if (writeInfo != null) - createImage(writeInfo); - if (autoExit) { - System.out.flush(); - System.exit(0); - } - } + if (isScriptFile && writeInfo != null) + createImage(writeInfo); } + if (isScriptFile && autoExit) { + System.out.flush(); + System.exit(0); + } if (returnType.equalsIgnoreCase("String")) return eval.getErrorMessage(); // get Vector of Vectors of Vectors info Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-23 20:41:52 UTC (rev 6011) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-24 13:34:34 UTC (rev 6012) @@ -386,6 +386,7 @@ options.addOption("n", "nodisplay", false, GT._("no display (and also exit when done)")); options.addOption("i", "silent", false, GT._("silent startup operation")); options.addOption("o", "noconsole", false, GT._("no console -- all output to sysout")); + options.addOption("x", "exit", false, GT._("exit after script (implicit with -n)")); OptionBuilder.withLongOpt("script"); OptionBuilder.withDescription("script file to execute"); @@ -412,11 +413,6 @@ OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("w")); - OptionBuilder.withLongOpt("exit"); - OptionBuilder.withDescription(GT._("exit after script (implicit with -n)")); - OptionBuilder.withValueSeparator('='); - OptionBuilder.hasArg(); - options.addOption(OptionBuilder.create("x")); int startupWidth = 0, startupHeight = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |