Changeset 27760 in osm for applications/editors/josm/plugins/routing

Timestamp:

2012-02-14T21:43:28+01:00 (12 years ago)

Author:

stoecker

Message:

remove calls to deprecated Preferences.hasKey()

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm

Files:

• jrt/core/PreferencesKeys.java (deleted)
• plugin/routing/RoutingLayer.java (modified) (4 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java

@@ -27 +27 @@
 
 package com.innovant.josm.plugin.routing;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BasicStroke;
@@ -59 +61 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-import com.innovant.josm.jrt.core.PreferencesKeys;
 import com.innovant.josm.jrt.osm.OsmEdge;
 
@@ -69 +70 @@
  */
 public class RoutingLayer extends Layer {
+
+    public enum PreferencesKeys {
+        KEY_ACTIVE_ROUTE_COLOR (marktr("routing active route")),
+        KEY_INACTIVE_ROUTE_COLOR (marktr("routing inactive route")),
+        KEY_ROUTE_WIDTH ("routing.route.width"),
+        KEY_ROUTE_SELECT ("routing.route.select");
+
+        public final String key;
+        PreferencesKeys (String key) {
+            this.key=key;
+        }
+
+        public String getKey() {return key;};
+    }
 
     /**
@@ -240 +255 @@
         // Get path stroke color from preferences
         // Color is different for active and inactive layers
-        String colorString;
+        Color color;
         if (isActiveLayer) {
-            if (Main.pref.hasKey(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key))
-                    colorString = Main.pref.get(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key);
-            else {
-                colorString = ColorHelper.color2html(Color.RED);
-                Main.pref.put(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key, colorString);
-            }
+            color = Main.pref.getColor(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key, Color.RED);
         } else {
-            if (Main.pref.hasKey(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key))
-                colorString = Main.pref.get(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key);
-            else {
-                colorString = ColorHelper.color2html(Color.decode("#dd2222"));
-                Main.pref.put(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key, colorString);
-            }
-        }
-        Color color = ColorHelper.html2color(colorString);
+            color = Main.pref.getColor(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key, Color.decode("#dd2222"));
+        }
 
         // Get path stroke width from preferences