Changeset 14718 in josm for trunk/src

Timestamp:

2019-01-21T23:07:32+01:00 (6 years ago)

Author:

simon04

Message:

see #16497 - Relative paths for geoimages in session file

Location:

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

Files:

• GenericSessionExporter.java (modified) (2 diffs)
• GeoImageSessionExporter.java (modified) (1 diff)
• SessionWriter.java (modified) (1 diff)

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

@@ -13 +13 @@
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Path;
 
 import javax.swing.AbstractAction;
@@ -194 +193 @@
             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();
-                }
+                final String fileString = support.relativize(f.toPath());
                 file.appendChild(support.createTextNode(fileString));
             }

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

@@ -69 +69 @@
                 break;
             }
-            addAttr("file", entry.getFile().getPath(), imgElem, support);
-            // FIXME: relative filenames as option
+            final String fileString = support.relativize(entry.getFile().toPath());
+            addAttr("file", fileString, imgElem, support);
             // FIXME: include images as option (?)
 

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

@@ -207 +207 @@
             return output;
         }
+
+        /**
+         * Returns a relative path w.r.t. the {@linkplain #getOutput output} directory
+         * @param path the path to relativize
+         * @return the relative path
+         * @see Path#relativize(Path)
+         */
+        String relativize(final Path path) {
+            if (getOutput() == null) {
+                return path.toString();
+            }
+            final Path sessionDirectory = getOutput().getParent();
+            if (path.startsWith(sessionDirectory)) {
+                return sessionDirectory.relativize(path).toString();
+            } else {
+                return path.toString();
+            }
+        }
     }