Changeset 13543 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

see #15310 - remove deprecated color stuff

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (7 diffs)
• data/preferences/ColorProperty.java (deleted)
• data/preferences/NamedColorProperty.java (modified) (3 diffs)
• gui/preferences/display/ColorPreference.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -28 +27 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -49 +47 @@
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ColorHelper;
-import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
@@ -116 +112 @@
 
     /**
-     * Maps color keys to human readable color name
-     * @deprecated (since 12987) no longer supported
-     */
-    @Deprecated
-    protected final SortedMap<String, String> colornames = new TreeMap<>();
-
-    /**
      * Indicates whether {@link #init(boolean)} completed successfully.
      * Used to decide whether to write backup preference file in {@link #save()}
@@ -153 +142 @@
      * @since 12634
      */
-    @SuppressWarnings("deprecation")
     public Preferences(Preferences pref) {
         this(pref.dirs);
         settingsMap.putAll(pref.settingsMap);
         defaultsMap.putAll(pref.defaultsMap);
-        colornames.putAll(pref.colornames);
     }
 
@@ -440 +427 @@
                         }
                     });
-        }
-        return all;
-    }
-
-    /**
-     * Gets all known colors (preferences starting with the color prefix)
-     * @return All colors
-     * @deprecated (since 12987) replaced by {@link #getAllNamedColors()}
-     */
-    @Deprecated
-    public synchronized Map<String, String> getAllColors() {
-        final Map<String, String> all = new TreeMap<>();
-        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) {
-                    all.put(e.getKey().substring(6), d.getValue());
-                }
-            }
-        }
-        for (final Entry<String, Setting<?>> e : settingsMap.entrySet()) {
-            if (e.getKey().startsWith(COLOR_PREFIX) && (e.getValue() instanceof StringSetting)) {
-                all.put(e.getKey().substring(6), ((StringSetting) e.getValue()).getValue());
-            }
         }
         return all;
@@ -701 +662 @@
 
     /**
-     * only for preferences
-     * @param o color key
-     * @return translated color name
-     * @deprecated (since 12987) no longer supported
-     */
-    @Deprecated
-    public synchronized String getColorName(String o) {
-        Matcher m = COLOR_LAYER_PATTERN.matcher(o);
-        if (m.matches()) {
-            return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
-        }
-        String fullKey = COLOR_PREFIX + o;
-        if (colornames.containsKey(fullKey)) {
-            String name = colornames.get(fullKey);
-            Matcher m2 = COLOR_MAPPAINT_PATTERN.matcher(name);
-            if (m2.matches()) {
-                return tr("Paint style {0}: {1}", tr(I18n.escape(m2.group(1))), tr(I18n.escape(m2.group(2))));
-            } else {
-                return tr(I18n.escape(colornames.get(fullKey)));
-            }
-        } else {
-            return fullKey;
-        }
-    }
-
-    /**
-     * Registers a color name conversion for the global color registry.
-     * @param colKey The key
-     * @param colName The name of the color.
-     * @since 10824
-     * @deprecated (since 12987) no longer supported
-     */
-    @Deprecated
-    public void registerColor(String colKey, String colName) {
-        if (!colKey.equals(colName)) {
-            colornames.put(colKey, colName);
-        }
-    }
-
-    /**
-     * Gets the default color that was registered with the preference
-     * @param colKey The color name
-     * @return The color
-     * @deprecated (since 12989) no longer supported
-     */
-    @Deprecated
-    public synchronized Color getDefaultColor(String colKey) {
-        StringSetting col = Utils.cast(defaultsMap.get(COLOR_PREFIX+colKey), StringSetting.class);
-        String colStr = col == null ? null : col.getValue();
-        return colStr == null || colStr.isEmpty() ? null : ColorHelper.html2color(colStr);
-    }
-
-    /**
-     * Stores a color
-     * @param colKey The color name
-     * @param val The color
-     * @return true if the setting was modified
-     * @see NamedColorProperty#put(Color)
-     * @deprecated (since 12987) no longer supported (see {@link NamedColorProperty})
-     */
-    @Deprecated
-    public synchronized boolean putColor(String colKey, Color val) {
-        return put(COLOR_PREFIX+colKey, val != null ? ColorHelper.color2html(val, true) : null);
-    }
-
-    /**
      * Set a value for a certain setting. The changed setting is saved to the preference file immediately.
      * Due to caching mechanisms on modern operating systems and hardware, this shouldn't be a performance problem.

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);
-            }
-        }
     }
 

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

@@ -13 +13 @@
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38 +37 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.ColorInfo;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -265 +264 @@
 
     /**
-     * Set the colors to be shown in the preference table. This method creates a table model if
-     * none exists and overwrites all existing values.
-     * @param colorMap the map holding the colors
-     * (key = color id (without prefixes, so only <code>background</code>; not <code>color.background</code>),
-     * value = html representation of the color.
-     * @deprecated (since 12987) replaced by {@link #setColors(java.util.Map)}
-     */
-    @Deprecated
-    public void setColorModel(Map<String, String> colorMap) {
-        setColors(colorMap.entrySet().stream().collect(Collectors.toMap(e->e.getKey(), e->
-            new ColorInfo(NamedColorProperty.COLOR_CATEGORY_GENERAL, null, e.getKey(), ColorHelper.html2color(e.getValue()), null))));
-    }
-
-    /**
      * Returns a map with the colors in the table (key = preference key, value = color info).
      * @return a map holding the colors.
@@ -284 +269 @@
     public Map<String, ColorInfo> getColors() {
         return tableModel.getData().stream().collect(Collectors.toMap(e -> e.key, e -> e.info));
-    }
-
-    /**
-     * Returns a map with the colors in the table (key = color name without prefix, value = html color code).
-     * @return a map holding the colors.
-     * @deprecated replaced by {@link #getColors()}
-     */
-    @Deprecated
-    public Map<String, String> getColorModel() {
-        Map<String, String> colorMap = new HashMap<>();
-        for (ColorEntry e : tableModel.getData()) {
-            colorMap.put(e.key, ColorHelper.color2html(e.getDisplayColor()));
-        }
-        return colorMap;
     }