(JAL-1022) reverted to original strategy of escaping filenames in Jmol scripts becaus...

[jalview.git] / src / jalview / gui / Jalview2XML.java

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index c8466b1..b1b1f55 100644 (file)
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -38,6 +38,7 @@ import jalview.datamodel.SequenceI;
 import jalview.schemabinding.version2.*;
 import jalview.schemes.*;
 import jalview.structure.StructureSelectionManager;
+import jalview.util.Platform;
 import jalview.util.jarInputStreamProvider;
 
 /**
@@ -1823,7 +1824,7 @@ public class Jalview2XML
         }
         ;
         out.close();
-        String t=outFile.toURI().getPath().substring(1);
+        String t=outFile.getAbsolutePath();
         alreadyLoadedPDB.put(pdbId, t);
         return t;
       }
@@ -2740,7 +2741,7 @@ public class Jalview2XML
               // have to normalize filename - since Jmol and jalview do filename
               // translation differently.
               Object[] filedat = oldFiles.get(new File(oldfilenam));
-              newFileLoc.append(((String) filedat[0]));
+              newFileLoc.append(Platform.escapeString((String) filedat[0]));
               pdbfilenames.addElement((String) filedat[0]);
               pdbids.addElement((String) filedat[1]);
               seqmaps.addElement((SequenceI[]) ((Vector<SequenceI>) filedat[2])