Changeset 14630 in josm for trunk/src

Timestamp:

2019-01-03T20:11:27+01:00 (6 years ago)

Author:

simon04

Message:

fix #16497 - Support relative paths in .joz session file

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• GenericSessionExporter.java (modified) (2 diffs)
• SessionWriter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java

@@ -13 +13 @@
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.MalformedURLException;
+import java.nio.file.Path;
 
 import javax.swing.AbstractAction;
@@ -192 +192 @@
             addDataFile(support.getOutputStreamZip(zipPath));
         } else {
-            try {
-                File f = layer.getAssociatedFile();
-                if (f != null) {
-                    file.appendChild(support.createTextNode(f.toURI().toURL().toString()));
+            File f = layer.getAssociatedFile();
+            if (f != null) {
+                final Path sessionDirectory = support.getOutput().getParent();
+                final String fileString;
+                if (f.toPath().startsWith(sessionDirectory)) {
+                    fileString = sessionDirectory.relativize(f.toPath()).toString();
+                } else {
+                    fileString = f.toPath().toString();
                 }
-            } catch (MalformedURLException e) {
-                throw new IOException(e);
+                file.appendChild(support.createTextNode(fileString));
             }
         }

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -9 +9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64 +65 @@
     private final boolean zip;
 
+    private Path output;
     private ZipOutputStream zipOut;
 
@@ -195 +197 @@
         public boolean isZip() {
             return zip;
+        }
+
+        /**
+         * Returns the path of the output file.
+         *
+         * @return the path of the output file
+         */
+        public Path getOutput() {
+            return output;
         }
     }
@@ -329 +340 @@
      */
     public void write(File f) throws IOException {
-        try (OutputStream out = Files.newOutputStream(f.toPath())) {
+        output = f.toPath();
+        try (OutputStream out = Files.newOutputStream(output)) {
             write(out);
         }