Changeset 12946 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-10-08T14:46:53+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - fix deleting color entries; do not display unchanged layer colors (this gets excessive if user opens may gpx files over time)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/preferences/display/ColorPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -642 +642 @@
         for (final Entry<String, Setting<?>> e : defaultsMap.entrySet()) {
             if (e.getKey().startsWith(COLOR_PREFIX) && e.getValue() instanceof StringSetting) {
+                if (e.getKey().startsWith(COLOR_PREFIX+"layer."))
+                    continue; // do not add unchanged layer colors
                 StringSetting d = (StringSetting) e.getValue();
                 if (d.getValue() != null) {

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -97 +97 @@
         Map<String, String> colorKeyListLayer = new TreeMap<>();
         for (String key : colorMap.keySet()) {
-            if (key.startsWith("layer ")) {
+            if (key.startsWith("layer.")) {
                 colorKeyListLayer.put(getName(key), key);
             } else if (key.startsWith("mappaint.")) {
@@ -251 +251 @@
 
     Boolean isRemoveColor(int row) {
-        return ((String) colors.getValueAt(row, 0)).startsWith("layer ");
+        return ((String) colors.getValueAt(row, 0)).startsWith("layer.");
     }
 
@@ -273 +273 @@
         boolean ret = false;
         for (String d : del) {
-            Config.getPref().put("color."+d, null);
+            Main.pref.putColor(d, null);
         }
         for (int i = 0; i < colors.getRowCount(); ++i) {