Changeset 33891 in osm for applications/editors

Timestamp:

2017-11-25T01:31:54+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12987

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• src/com/innovant/josm/plugin/routing/RoutingLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/routing/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="added one-way support in roundabouts"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12840"/>
+    <property name="plugin.main.version" value="12987"/>
 
     <!--

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -206 +207 @@
         Color color;
         if (isActiveLayer) {
-            color = Main.pref.getColor(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key, Color.RED);
+            color = new NamedColorProperty(PreferencesKeys.KEY_ACTIVE_ROUTE_COLOR.key, Color.RED).get();
         } else {
-            color = Main.pref.getColor(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key, Color.decode("#dd2222"));
+            color = new NamedColorProperty(PreferencesKeys.KEY_INACTIVE_ROUTE_COLOR.key, Color.decode("#dd2222")).get();
         }