Changeset 14152 in josm for trunk/src/org

Timestamp:

2018-08-12T21:38:40+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15410, see #16604 - restore restart notification when mappaint colors are modified in preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences/ColorInfo.java (modified) (2 diffs)
• gui/preferences/display/ColorPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/ColorInfo.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.util.List;
+
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -149 +150 @@
     }
 
+    @Override
+    public String toString() {
+        return "ColorInfo [" + (category != null ? "category=" + category + ", " : "")
+                + (source != null ? "source=" + source + ", " : "") + (name != null ? "name=" + name + ", " : "")
+                + (value != null ? "value=" + value + ", " : "")
+                + (defaultValue != null ? "defaultValue=" + defaultValue : "") + "]";
+    }
 }

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

@@ -236 +236 @@
                 .sorted((e1, e2) -> {
                     int cat = Integer.compare(
-                            getCategroyPriority(e1.info.getCategory()),
-                            getCategroyPriority(e2.info.getCategory()));
+                            getCategoryPriority(e1.info.getCategory()),
+                            getCategoryPriority(e2.info.getCategory()));
                     if (cat != 0) return cat;
                     return Collator.getInstance().compare(e1.getDisplay(), e2.getDisplay());
@@ -246 +246 @@
             this.colors.repaint();
         }
-
-    }
-
-    private static int getCategroyPriority(String category) {
+    }
+
+    private static int getCategoryPriority(String category) {
         switch (category) {
             case NamedColorProperty.COLOR_CATEGORY_GENERAL: return 1;
@@ -409 +408 @@
             if (e.info.getValue() != null) {
                 if (e.toProperty().put(e.info.getValue())
-                        && e.key.startsWith("mappaint.")) {
+                        && NamedColorProperty.COLOR_CATEGORY_MAPPAINT.equals(e.info.getCategory())) {
                     ret = true;
                 }