Changeset 14723 in josm for trunk/src

Timestamp:

2019-01-23T22:20:29+01:00 (6 years ago)

Author:

simon04

Message:

see #16497 fix #17228 - Avoid backslashes in session files

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (modified) (3 diffs)

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

@@ -16 +16 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -45 +46 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlUtils;
@@ -214 +216 @@
          * @see Path#relativize(Path)
          */
-        String relativize(final Path path) {
-            if (getOutput() == null) {
-                return path.toString();
+        String relativize(Path path) {
+            final Path output = getOutput();
+            if (output != null && path.startsWith(output.getParent())) {
+                path = output.getParent().relativize(path);
             }
-            final Path sessionDirectory = getOutput().getParent();
-            if (path.startsWith(sessionDirectory)) {
-                return sessionDirectory.relativize(path).toString();
-            } else {
-                return path.toString();
-            }
+            // path.toString() returns backslashes on Windows, see #17228
+            return StreamUtils.toStream(path)
+                    .map(Object::toString)
+                    .collect(Collectors.joining("/"));
         }
     }