Changeset 1243 in josm for trunk/src/org

Timestamp:

2009-01-11T13:14:01+01:00 (16 years ago)

Author:

stoecker

Message:

restart-warn when changing mappaint colors

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -230 +230 @@
         if(value != null && value.length() == 0)
             value = null;
-        if(!((oldvalue == null && value == null) || (value != null
-        && oldvalue != null && oldvalue.equals(value))))
+        if(!((oldvalue == null && (value == null || value.equals(defaults.get(key))))
+        || (value != null && oldvalue != null && oldvalue.equals(value))))
         {
             if (value == null)
@@ -237 +237 @@
             else
                 properties.put(key, value);
-            String s = defaults.get(key);
             save();
             firePreferenceChanged(key, value);

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

@@ -183 +183 @@
 
     public boolean ok() {
+        Boolean ret = false;
         for (int i = 0; i < colors.getRowCount(); ++i) {
-            Main.pref.putColor((String)colors.getValueAt(i, 0), (Color)colors.getValueAt(i, 1));
+            String key = (String)colors.getValueAt(i, 0);
+            if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1)))
+            {
+                if(key.startsWith("mappaint."))
+                    ret = true;
+            }
         }
         org.openstreetmap.josm.gui.layer.OsmDataLayer.createHatchTexture();
-        return false;
+        return ret;
     }
 }