Ticket #8614: mapcss_and_preset_in_zip.patch

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

@@ -212 +212 @@
         MirroredInputStream in = null;
         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);
             if (entry.url.toLowerCase().endsWith(".xml"))