Changeset 11913 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2017-04-15T01:38:46+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1192 - String literals should not be duplicated

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (7 diffs)

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

@@ -106 +106 @@
 public class Preferences {
 
+    private static final String COLOR_PREFIX = "color.";
+
     private static final String[] OBSOLETE_PREF_KEYS = {
       "hdop.factor", /* remove entry after April 2017 */
@@ -501 +503 @@
         final Map<String, String> all = new TreeMap<>();
         for (final Entry<String, Setting<?>> e : defaultsMap.entrySet()) {
-            if (e.getKey().startsWith("color.") && e.getValue() instanceof StringSetting) {
+            if (e.getKey().startsWith(COLOR_PREFIX) && e.getValue() instanceof StringSetting) {
                 StringSetting d = (StringSetting) e.getValue();
                 if (d.getValue() != null) {
@@ -509 +511 @@
         }
         for (final Entry<String, Setting<?>> e : settingsMap.entrySet()) {
-            if (e.getKey().startsWith("color.") && (e.getValue() instanceof StringSetting)) {
+            if (e.getKey().startsWith(COLOR_PREFIX) && (e.getValue() instanceof StringSetting)) {
                 all.put(e.getKey().substring(6), ((StringSetting) e.getValue()).getValue());
             }
@@ -864 +866 @@
         String colKey = ColorProperty.getColorKey(colName);
         registerColor(colKey, colName);
-        String colStr = specName != null ? get("color."+specName) : "";
+        String colStr = specName != null ? get(COLOR_PREFIX+specName) : "";
         if (colStr.isEmpty()) {
             colStr = get(colKey, ColorHelper.color2html(def, true));
@@ -888 +890 @@
 
     public synchronized Color getDefaultColor(String colKey) {
-        StringSetting col = Utils.cast(defaultsMap.get("color."+colKey), StringSetting.class);
+        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);
@@ -894 +896 @@
 
     public synchronized boolean putColor(String colKey, Color val) {
-        return put("color."+colKey, val != null ? ColorHelper.color2html(val, true) : null);
+        return put(COLOR_PREFIX+colKey, val != null ? ColorHelper.color2html(val, true) : null);
     }
 
@@ -1532 +1534 @@
     private void migrateOldColorKeys() {
         settingsMap.keySet().stream()
-                .filter(key -> key.startsWith("color."))
+                .filter(key -> key.startsWith(COLOR_PREFIX))
                 .flatMap(key -> {
-                    final String newKey = ColorProperty.getColorKey(key.substring("color.".length()));
+                    final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
                     return key.equals(newKey) || settingsMap.containsKey(newKey)
                             ? Stream.empty()