Index: trunk/data/mappaint-style.xsd
===================================================================
--- trunk/data/mappaint-style.xsd (revision 9964)
+++ (revision )
@@ -1,129 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 9964)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 9965)
@@ -1434,36 +1434,4 @@
*/
private void removeObsolete(int loadedVersion) {
- // drop this block march 2016
- // update old style JOSM server links to use zip now, see #10581, #12189
- // actually also cache and mirror entries should be cleared
- if (loadedVersion < 9216) {
- for (String key: new String[]{"mappaint.style.entries", "taggingpreset.entries"}) {
- Collection> data = getListOfStructs(key, (Collection>) null);
- if (data != null) {
- List> newlist = new ArrayList<>();
- boolean modified = false;
- for (Map map : data) {
- Map newmap = new LinkedHashMap<>();
- for (Entry entry : map.entrySet()) {
- String val = entry.getValue();
- String mkey = entry.getKey();
- if ("url".equals(mkey) && val.contains("josm.openstreetmap.de/josmfile") && !val.contains("zip=1")) {
- val += "&zip=1";
- modified = true;
- }
- if ("url".equals(mkey) && val.contains("http://josm.openstreetmap.de/josmfile")) {
- val = val.replace("http://", "https://");
- modified = true;
- }
- newmap.put(mkey, val);
- }
- newlist.add(newmap);
- }
- if (modified) {
- putListOfStructs(key, newlist);
- }
- }
- }
- }
/* drop in October 2016 */
if (loadedVersion < 9715) {
@@ -1491,4 +1459,23 @@
}
}
+ // drop in November 2016
+ if (loadedVersion < 9965) {
+ Setting setting = settingsMap.get("mappaint.style.entries");
+ if (setting != null && setting instanceof MapListSetting) {
+ List> l = new LinkedList<>();
+ boolean modified = false;
+ for (Map map: ((MapListSetting) setting).getValue()) {
+ String url = map.get("url");
+ if (url != null && url.contains("josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard")) {
+ modified = true;
+ } else {
+ l.add(map);
+ }
+ }
+ if (modified) {
+ putListOfStructs("mappaint.style.entries", l);
+ }
+ }
+ }
for (String key : OBSOLETE_PREF_KEYS) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 9964)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 9965)
@@ -39,5 +39,4 @@
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.mappaint.Cascade;
-import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -47,5 +46,5 @@
import org.openstreetmap.josm.gui.mappaint.StyleSource;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -423,7 +422,5 @@
private static String getSort(StyleSource s) {
- if (s instanceof XmlStyleSource) {
- return tr("xml");
- } else if (s instanceof MapCSSStyleSource) {
+ if (s instanceof MapCSSStyleSource) {
return tr("mapcss");
} else {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 9964)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 9965)
@@ -18,4 +18,5 @@
import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -25,14 +26,16 @@
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
-import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference.MapPaintPrefHelper;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -46,4 +49,8 @@
*/
public final class MapPaintStyles {
+
+ /** To remove in November 2016 */
+ private static final String XML_STYLE_MIME_TYPES =
+ "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
private static ElemStyles styles = new ElemStyles();
@@ -280,10 +287,8 @@
private static StyleSource fromSourceEntry(SourceEntry entry) {
- CachedFile cf = null;
- try {
- Set mimes = new HashSet<>();
- mimes.addAll(Arrays.asList(XmlStyleSource.XML_STYLE_MIME_TYPES.split(", ")));
- mimes.addAll(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
- cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes));
+ // TODO: Method to clean up in November 2016: remove XML detection completely
+ Set mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
+ mimes.addAll(Arrays.asList(XML_STYLE_MIME_TYPES.split(", ")));
+ try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
String zipEntryPath = cf.findZipEntryPath("mapcss", "style");
if (zipEntryPath != null) {
@@ -293,39 +298,37 @@
}
zipEntryPath = cf.findZipEntryPath("xml", "style");
- if (zipEntryPath != null)
- return new XmlStyleSource(entry);
+ if (zipEntryPath != null || Utils.hasExtension(entry.url, "xml"))
+ throw new IllegalDataException("XML style");
if (Utils.hasExtension(entry.url, "mapcss"))
return new MapCSSStyleSource(entry);
- if (Utils.hasExtension(entry.url, "xml"))
- return new XmlStyleSource(entry);
- else {
- try (InputStreamReader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
- WHILE: while (true) {
- int c = reader.read();
- switch (c) {
- case -1:
- break WHILE;
- case ' ':
- case '\t':
- case '\n':
- case '\r':
- continue;
- case '<':
- return new XmlStyleSource(entry);
- default:
- return new MapCSSStyleSource(entry);
- }
+ try (InputStreamReader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
+ WHILE: while (true) {
+ int c = reader.read();
+ switch (c) {
+ case -1:
+ break WHILE;
+ case ' ':
+ case '\t':
+ case '\n':
+ case '\r':
+ continue;
+ case '<':
+ throw new IllegalDataException("XML style");
+ default:
+ return new MapCSSStyleSource(entry);
}
}
- Main.warn("Could not detect style type. Using default (xml).");
- return new XmlStyleSource(entry);
- }
+ }
+ Main.warn("Could not detect style type. Using default (mapcss).");
+ return new MapCSSStyleSource(entry);
} catch (IOException e) {
Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
Main.error(e);
- } finally {
- if (cf != null) {
- cf.close();
- }
+ } catch (IllegalDataException e) {
+ String msg = tr("JOSM does no longer support mappaint styles written in the old XML format.\nPlease update ''{0}'' to MapCSS",
+ entry.url);
+ Main.error(msg);
+ HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Warning"), JOptionPane.WARNING_MESSAGE,
+ HelpUtil.ht("/Styles/MapCSSImplementation"));
}
return null;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 9964)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 9965)
@@ -1390,4 +1390,10 @@
}
readFile();
+ for (Iterator it = sources.iterator(); it.hasNext();) {
+ if ("xml".equals(it.next().styleType)) {
+ Main.debug("Removing XML source entry");
+ it.remove();
+ }
+ }
} catch (IOException e) {
if (canceled)