Ticket #11663: color_property.patch

src/org/openstreetmap/josm/data/preferences/ColorProperty.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.preferences;
 
 import java.awt.Color;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences.ColorKey;
@@ -35 +38 @@
         return Main.pref.putColor(getColorKey(name), value);
     }
 
+    private static final Map<String, String> XLATED_COLOR_KEYS = new HashMap<String, String>();
+    private static final Pattern XLATED_COLOR_PATTERN = Pattern.compile("[^a-z0-9]+");
+
     /**
      * Replies the color key used in JOSM preferences for this property.
      * @param colName The color name
@@ -41 +47 @@
      * @return The color key for this property
      */
     public static String getColorKey(String colName) {
-        return colName == null ? null : colName.toLowerCase(Locale.ENGLISH).replaceAll("[^a-z0-9]+", ".");
+
+        if (colName == null) {
+            return null;
+        }
+
+        synchronized (XLATED_COLOR_KEYS) {
+            String xlated = XLATED_COLOR_KEYS.get(colName);
+            if (xlated == null) {
+                xlated = XLATED_COLOR_PATTERN.matcher(colName.toLowerCase(Locale.ENGLISH)).replaceAll(".");
+                XLATED_COLOR_KEYS.put(colName, xlated);
+            }
+            return xlated;
+        }
     }
 
     @Override