From: <ha...@us...> - 2011-06-12 15:01:03
|
Revision: 15570 http://jmol.svn.sourceforge.net/jmol/?rev=15570&view=rev Author: hansonr Date: 2011-06-12 15:00:57 +0000 (Sun, 12 Jun 2011) Log Message: ----------- version=12.1.50_dev #bug fix: on Mac systems, not finding local files to include in .jmol file (was losing first "/"). Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/FileManager.java Modified: trunk/Jmol/src/org/jmol/viewer/FileManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/FileManager.java 2011-06-12 14:53:26 UTC (rev 15569) +++ trunk/Jmol/src/org/jmol/viewer/FileManager.java 2011-06-12 15:00:57 UTC (rev 15570) @@ -1175,8 +1175,11 @@ bos == null ? (OutputStream) new FileOutputStream(outFileName) : bos); for (int i = 0; i < fileNamesAndByteArrays.size(); i += 2) { String fname = (String) fileNamesAndByteArrays.get(i); - if (fname.indexOf("file:/") == 0) + if (fname.indexOf("file:/") == 0) { fname = fname.substring(5); + if (fname.length() > 2 && fname.charAt(2) == ':') // DOS/Windows + fname = fname.substring(1); + } byte[] bytes = (byte[]) fileNamesAndByteArrays.get(i + 1); String fnameShort = fname; if (!preservePath || fname.indexOf("|") >= 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |