Changeset 14741 in josm for trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java

Timestamp:

2019-01-27T18:58:32+01:00 (5 years ago)

Author:

simon04

Message:

see #16497 - revert r14725/r14724/r14723/r14718/r14630

Support for relative paths in .joz session file needs more testing.

File:

• trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java (modified) (2 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 javax.swing.AbstractAction;
@@ -191 +192 @@
             addDataFile(support.getOutputStreamZip(zipPath));
         } else {
-            File f = layer.getAssociatedFile();
-            if (f != null) {
-                final String fileString = support.relativize(f.toPath());
-                file.appendChild(support.createTextNode(fileString));
+            try {
+                File f = layer.getAssociatedFile();
+                if (f != null) {
+                    file.appendChild(support.createTextNode(f.toURI().toURL().toString()));
+                }
+            } catch (MalformedURLException e) {
+                throw new IOException(e);
             }
         }