Changeset 13543 in josm for trunk/src/org/openstreetmap/josm/data/preferences

Timestamp:

2018-03-19T00:22:20+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15310 - remove deprecated color stuff

Location:

trunk/src/org/openstreetmap/josm/data/preferences

Files:

• ColorProperty.java (deleted)
• NamedColorProperty.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
+
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -72 +72 @@
             return ColorHelper.html2color(data.get(0));
         }
-        return Optional.ofNullable(migrate()).orElse(defaultValue);
-    }
-
-    /**
-     * migrate to new color preferences scheme - remove 4 months after {@link ColorProperty} is removed.
-     * @return the old preferences value
-     */
-    private Color migrate() {
-        String s = getPreferences().get(getOldColorKey(), null);
-        if (s != null) {
-            Color c = ColorHelper.html2color(s);
-            if (c != null) {
-                put(c);
-                return c;
-            }
-        }
-        return null;
+        return defaultValue;
     }
 
@@ -95 +79 @@
         get(); // trigger migration
         return super.isSet();
-    }
-
-    @SuppressWarnings("deprecation")
-    private String getOldColorKey() {
-        switch (category) {
-            case COLOR_CATEGORY_MAPPAINT:
-                return ColorProperty.getColorKey("mappaint." + (source == null ? "MapCSS" : source) + "." + name);
-            case COLOR_CATEGORY_LAYER:
-            {
-                String k = "layer " + (source == null ? "" : source);
-                return ColorProperty.getColorKey(k);
-            }
-            default:
-            {
-                String k = name;
-                if (source != null) {
-                    k = source + "." + k;
-                }
-                return ColorProperty.getColorKey(k);
-            }
-        }
     }