Changeset 6151 in josm for trunk/src

Timestamp:

2013-08-16T10:13:47+02:00 (11 years ago)

Author:

bastiK

Message:

#8972 - Receiving nullpointer exception when loading map style whose paths are relative to zip root

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/SourceEntry.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)

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

@@ -159 +159 @@
     /**
      * 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
+     * @return the parent directory of the resource inside the zip file,
+     * "." if zipEntryPath is a top level file; null, if zipEntryPath is null
      */
     public String getZipEntryDirName() {
         if (zipEntryPath == null) return null;
-        return new File(zipEntryPath).getParent().toString();
+        File file = new File(zipEntryPath);
+        File dir = file.getParentFile();
+        if (dir == null) return ".";
+        return dir.getPath();
     }
 }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -539 +539 @@
         {
             zipFile = new ZipFile(archive);
-            String entry_name;
-            if (inArchiveDir != null) {
-                File dir = new File(inArchiveDir);
-                entry_name = new File(dir, full_name).getPath();
-            } else {
-                entry_name = full_name;
-            }
+            if (inArchiveDir == null || inArchiveDir.equals(".")) {
+                inArchiveDir = "";
+            } else if (!inArchiveDir.isEmpty()) {
+                inArchiveDir += "/";
+            }
+            String entry_name = inArchiveDir + full_name;
             ZipEntry entry = zipFile.getEntry(entry_name);
             if(entry != null)