Changeset 6867 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

Timestamp:

2014-02-18T00:35:15+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9715 - Set HTTP Accept header to expected MIME types when downloading presets, styles, plugins

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -217 +219 @@
         MirroredInputStream in = null;
         try {
-            in = new MirroredInputStream(entry.url);
+            Set<String> mimes = new HashSet<String>();
+            mimes.addAll(Arrays.asList(XmlStyleSource.XML_STYLE_MIME_TYPES.split(", ")));
+            mimes.addAll(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
+            in = new MirroredInputStream(entry.url, null, Utils.join(", ", mimes));
             String zipEntryPath = in.findZipEntryPath("mapcss", "style");
             if (zipEntryPath != null) {