Changeset 6148 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java

Timestamp:

2013-08-14T13:12:50+02:00 (11 years ago)

Author:

bastiK

Message:

fixed #8686 - Allow ZIP files whose paths are relative to the ZIP root in JOSM's map styling

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences;
+
+import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 /**
@@ -19 +19 @@
      */
     public String url;
+
+    /**
+     * Indicates, that {@link #url} is a zip file and the resource is
+     * inside the zip file.
+     */
+    public boolean isZip;
+
+    /**
+     * If {@link #isZip} is true, denotes the path inside the zip file.
+     */
+    public String zipEntryPath;
 
     /**
@@ -42 +53 @@
     public boolean active;
 
-    public SourceEntry(String url, String name, String title, Boolean active) {
+    public SourceEntry(String url, boolean isZip, String zipEntryPath, String name, String title, boolean active) {
         this.url = url;
+        this.isZip = isZip;
+        this.zipEntryPath = equal(zipEntryPath, "") ? null : zipEntryPath;
         this.name = equal(name, "") ? null : name;
         this.title = equal(title, "") ? null : title;
@@ -49 +62 @@
     }
 
+    public SourceEntry(String url, String name, String title, Boolean active) {
+        this(url, false, null, name, title, active);
+    }
+
     public SourceEntry(SourceEntry e) {
         this.url = e.url;
+        this.isZip = e.isZip;
+        this.zipEntryPath = e.zipEntryPath;
         this.name = e.name;
         this.title = e.title;
@@ -62 +81 @@
         final SourceEntry other = (SourceEntry) obj;
         return equal(other.url, url) &&
+                other.isZip == isZip &&
+                equal(other.zipEntryPath, zipEntryPath) &&
                 equal(other.name, name) &&
                 equal(other.title, title) &&
@@ -71 +92 @@
         int hash = 5;
         hash = 89 * hash + (this.url != null ? this.url.hashCode() : 0);
+        hash = 89 * hash + (this.isZip ? 1 : 0);
+        hash = 89 * hash + (this.zipEntryPath != null ? this.zipEntryPath.hashCode() : 0);
         hash = 89 * hash + (this.name != null ? this.name.hashCode() : 0);
         hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
@@ -133 +156 @@
         return dir.getPath();
     }
+
+    /**
+     * Returns the parent directory of the resource inside the zip file.
+     * @return null, if zipEntryPath is null, otherwise the parent directory of
+     * the resource inside the zip file
+     */
+    public String getZipEntryDirName() {
+        if (zipEntryPath == null) return null;
+        return new File(zipEntryPath).getParent().toString();
+    }
 }