Changeset 5875 in josm for trunk

Timestamp:

2013-04-17T00:28:38+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8614 - Mapcss in zip-file doesn't work if there's xml-files also in there (patch by Daeron)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -213 +213 @@
         try {
             in = new MirroredInputStream(entry.url);
-            InputStream zip = in.getZipEntry("xml", "style");
+            InputStream zip = in.getZipEntry("mapcss", "style");
+            if (zip != null)
+                return new MapCSSStyleSource(entry);
+            zip = in.getZipEntry("xml", "style");
             if (zip != null)
                 return new XmlStyleSource(entry);
-            zip = in.getZipEntry("mapcss", "style");
-            if (zip != null)
-                return new MapCSSStyleSource(entry);
             if (entry.url.toLowerCase().endsWith(".mapcss"))
                 return new MapCSSStyleSource(entry);