Revision: 18604 http://sourceforge.net/p/jmol/code/18604 Author: hansonr Date: 2013-08-20 14:41:52 +0000 (Tue, 20 Aug 2013) Log Message: ----------- ___JmolVersion="13.3.4_dev_2013.08.20"
bug fix: File dialog problems with paths having space Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/StateManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-20 14:40:48 UTC (rev 18603) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-20 14:41:52 UTC (rev 18604) @@ -11,8 +11,9 @@ # The quotes above look odd for a parameter file, but they are # important for the JavaScript version of Jmol. -___JmolVersion="13.3.4_dev_2013.08.19" +___JmolVersion="13.3.4_dev_2013.08.20" +bug fix: File dialog problems with paths having space bug fix: GAMESS reader not reading energies bug fix: TRY failure in a load command followed by a successful load having a loadScript will pop past the second TRY and crash Jmol Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-08-20 14:40:48 UTC (rev 18603) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-08-20 14:41:52 UTC (rev 18604) @@ -1035,7 +1035,7 @@ final P3 ptDefaultLattice = new P3(); String defaultLoadScript = ""; String defaultLoadFilter = ""; - String defaultDropScript = "zap; load SYNC %FILE;if (%ALLOWCARTOONS && _loadScript == '' && defaultLoadScript == '' && _filetype == 'Pdb') {if ({(protein or nucleic)&*/1.1} && {*/1.1}[1].groupindex != {*/1.1}[0].groupindex){select protein or nucleic;cartoons only;}if ({visible}){color structure}else{wireframe -0.1};if (!{visible}){spacefill 23%};select *}"; + String defaultDropScript = "zap; load SYNC \"%FILE\";if (%ALLOWCARTOONS && _loadScript == '' && defaultLoadScript == '' && _filetype == 'Pdb') {if ({(protein or nucleic)&*/1.1} && {*/1.1}[1].groupindex != {*/1.1}[0].groupindex){select protein or nucleic;cartoons only;}if ({visible}){color structure}else{wireframe -0.1};if (!{visible}){spacefill 23%};select *}"; // boolean _fileCaching = false; // String _fileCache = ""; boolean forceAutoBond = false; Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-20 14:40:48 UTC (rev 18603) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-20 14:41:52 UTC (rev 18604) @@ -9198,7 +9198,7 @@ Logger.info(GT._("Setting log file to {0}", path)); global.setS("_logFile", logFile = path); } - return value; + return value; } public void log(String data) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Introducing Performance Central, a new site from SourceForge and AppDynamics. Performance Central is your source for news, insights, analysis and resources for efficient Application Performance Management. Visit us today! http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk _______________________________________________ Jmol-commits mailing list Jmol-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jmol-commits