Changeset 6148 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

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/mappaint/mapcss/MapCSSStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -6 +6 @@
 import java.awt.Color;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11 +12 @@
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -88 +91 @@
 
         MirroredInputStream in = new MirroredInputStream(url);
-        InputStream zip = in.getZipEntry("mapcss", "style");
-        if (zip != null) {
-            zipIcons = in.getFile();
-            return zip;
+        if (isZip) {
+            File file = in.getFile();
+            Utils.close(in);
+            ZipFile zipFile = new ZipFile(file);
+            zipIcons = file;
+            ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
+            return zipFile.getInputStream(zipEntry);
         } else {
             zipIcons = null;