Changeset 6151 in josm for trunk/src/org/openstreetmap/josm/tools

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

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)

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)