Changeset 15211 in josm for trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java

Timestamp:

2019-07-06T22:15:55+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #13458 - display external resources icons in the preferences

File:

• trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java

@@ -7 +7 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14 +13 @@
 
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -84 +84 @@
         defJosmMapcss.active = true;
         defJosmMapcss.name = "standard";
+        defJosmMapcss.icon = new ImageProvider("logo").getResource();
         defJosmMapcss.title = tr("JOSM default (MapCSS)");
         defJosmMapcss.description = tr("Internal style to be used as base for runtime switchable overlay styles");
@@ -89 +90 @@
         defPL2.active = false;
         defPL2.name = "standard";
+        defPL2.icon = new ImageProvider("dialogs/mappaint", "pl2_small").getResource();
         defPL2.title = tr("Potlatch 2");
         defPL2.description = tr("the main Potlatch 2 style");
@@ -97 +99 @@
     @Override
     public Map<String, String> serialize(SourceEntry entry) {
-        Map<String, String> res = new HashMap<>();
-        res.put("url", entry.url == null ? "" : entry.url);
-        res.put("title", entry.title == null ? "" : entry.title);
+        Map<String, String> res = super.serialize(entry);
         res.put("active", Boolean.toString(entry.active));
         if (entry.name != null) {