Changeset 34554 in osm

Timestamp:

2018-08-18T20:13:39+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• src/com/innovant/josm/jrt/core/RoutingProfile.java (modified) (2 diffs)
• src/com/innovant/josm/plugin/routing/RoutingLayer.java (modified) (3 diffs)
• src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java (modified) (3 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="12987"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!--

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java

@@ -6 +6 @@
 
 import org.apache.log4j.Logger;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 
 
@@ -77 +77 @@
         this.name = name;
         waySpeeds = new HashMap<>();
-        Map<String, String> prefs = Main.pref.getAllPrefix("routing.profile."+name+".speed");
+        Map<String, String> prefs = Preferences.main().getAllPrefix("routing.profile."+name+".speed");
         for (String key:prefs.keySet()) {
             waySpeeds.put((key.split("\\.")[4]), Double.valueOf(prefs.get(key)));

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

@@ -21 +21 @@
 
 import org.apache.log4j.Logger;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -35 +34 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -214 +214 @@
 
         // Get path stroke width from preferences
-        String widthString = Main.pref.get(PreferencesKeys.KEY_ROUTE_WIDTH.key);
+        String widthString = Config.getPref().get(PreferencesKeys.KEY_ROUTE_WIDTH.key);
         if (widthString.length() == 0) {
             widthString = "2";                        /* I think 2 is better  */
-            // FIXME add after good width is found: Main.pref.put(KEY_ROUTE_WIDTH, widthString);
+            // FIXME add after good width is found: Config.getPref().put(KEY_ROUTE_WIDTH, widthString);
         }
         int width = Integer.parseInt(widthString);

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

@@ -27 +27 @@
 
 import org.apache.log4j.Logger;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -156 +157 @@
                 String origValue = orig.get(key);
                 if (origValue == null || !origValue.equals(value))
-                    Main.pref.put(key, value);
+                    Config.getPref().put(key, value);
                 orig.remove(key); // processed.
             }
         }
         for (Entry<String, String> e : orig.entrySet()) {
-            Main.pref.put(e.getKey(), null);
+            Config.getPref().put(e.getKey(), null);
         }
         return false;
@@ -189 +190 @@
 
     private void readPreferences() {
-        orig = Main.pref.getAllPrefix("routing.profile.default.speed");
+        orig = Preferences.main().getAllPrefix("routing.profile.default.speed");
         if (orig.size() == 0) { // defaults
             logger.debug("Loading Default Preferences.");
             for (OsmWayTypes owt : OsmWayTypes.values()) {
-                Main.pref.putInt("routing.profile.default.speed."
+                Config.getPref().putInt("routing.profile.default.speed."
                         + owt.getTag(), owt.getSpeed());
             }
-            orig = Main.pref.getAllPrefix("routing.profile.default.speed");
+            orig = Preferences.main().getAllPrefix("routing.profile.default.speed");
         } else logger.debug("Default preferences already exist.");
     }