From: <ha...@us...> - 2007-11-25 23:49:18
|
Revision: 8671 http://jmol.svn.sourceforge.net/jmol/?rev=8671&view=rev Author: hansonr Date: 2007-11-25 15:49:16 -0800 (Sun, 25 Nov 2007) Log Message: ----------- version=11.3.48 ZIP file with JmolManifest; load command MANIFEST option # new feature: load "myfile.zip" MANIFEST "...." # new feature: JmolManifest in a zip file directs which files to load and in what order 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 2007-11-25 23:45:32 UTC (rev 8670) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-11-25 23:49:16 UTC (rev 8671) @@ -4040,7 +4040,7 @@ loadScript.append(" ").append(Escape.escape(filename)).append(";"); if (!isSyntaxCheck || isScriptCheck && fileOpenCheck) viewer.openFile(filename, htParams, loadScript.toString(), isAppend); - } else if (getToken(i + 1).tok == Token.leftbrace + } else if (getToken(i + 1).tok == Token.leftbrace || theTok == Token.point3f || theTok == Token.integer || theTok == Token.identifier) { if ((filename = parameterAsString(i++)).length() == 0) filename = viewer.getFullPathName(); @@ -4050,7 +4050,9 @@ int tok; if ((tok = tokAt(i)) == Token.identifier && parameterAsString(i).equalsIgnoreCase("manifest")) { - htParams.put("manifest", stringParameter(++i)); + String manifest = stringParameter(++i); + htParams.put("manifest", manifest); + loadScript.append(" MANIFEST ").append(Escape.escape(manifest)); tok = tokAt(++i); } if (tok == Token.integer) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |