Changeset 34526 in osm for applications/editors/josm

Timestamp:

2018-08-18T18:38:37+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/livegps

Files:

• build.xml (modified) (1 diff)
• src/livegps/LiveGpsAcquirer.java (modified) (2 diffs)
• src/livegps/LiveGpsDrawHelper.java (modified) (3 diffs)
• src/livegps/LiveGpsLayer.java (modified) (3 diffs)

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

@@ -2 +2 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="12987"/>
+    <property name="plugin.main.version" value="14153"/>
         
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

@@ -21 +21 @@
 import javax.json.JsonObject;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -47 +47 @@
     public LiveGpsAcquirer() {
 
-        gpsdHost = Main.pref.get(C_HOST, DEFAULT_HOST);
-        gpsdPort = Main.pref.getInt(C_PORT, DEFAULT_PORT);
+        gpsdHost = Config.getPref().get(C_HOST, DEFAULT_HOST);
+        gpsdPort = Config.getPref().getInt(C_PORT, DEFAULT_PORT);
         // put the settings back in to the preferences, makes keys appear.
-        Main.pref.put(C_HOST, gpsdHost);
-        Main.pref.putInt(C_PORT, gpsdPort);
+        Config.getPref().put(C_HOST, gpsdHost);
+        Config.getPref().putInt(C_PORT, gpsdPort);
     }
 

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDrawHelper.java

@@ -6 +6 @@
 import java.awt.Point;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.preferences.CachingProperty;
@@ -13 +12 @@
 import org.openstreetmap.josm.gui.layer.MapViewGraphics;
 import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 public class LiveGpsDrawHelper extends GpxDrawHelper {
@@ -48 +48 @@
         Point screen = mv.getPoint(lastPoint.getCoor());
 
-        int TriaHeight = Main.pref.getInt(C_CURSOR_H, 20);
-        int TriaWidth = Main.pref.getInt(C_CURSOR_W, 10);
-        int TriaThick = Main.pref.getInt(C_CURSOR_T, 4);
+        int TriaHeight = Config.getPref().getInt(C_CURSOR_H, 20);
+        int TriaWidth = Config.getPref().getInt(C_CURSOR_W, 10);
+        int TriaThick = Config.getPref().getInt(C_CURSOR_T, 4);
 
         /*

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java

@@ -13 +13 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -20 +19 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 public class LiveGpsLayer extends GpxLayer implements PropertyChangeListener {
@@ -139 +139 @@
      */
     private void initIntervals() {
-        if ((refreshInterval = Main.pref.getInt(oldC_REFRESH_INTERVAL, 0)) != 0) {
+        if ((refreshInterval = Config.getPref().getInt(oldC_REFRESH_INTERVAL, 0)) != 0) {
             refreshInterval *= 1000;
-            Main.pref.put(oldC_REFRESH_INTERVAL, null);
+            Config.getPref().put(oldC_REFRESH_INTERVAL, null);
         } else
-            refreshInterval = Main.pref.getInt(C_REFRESH_INTERVAL, DEFAULT_REFRESH_INTERVAL);
+            refreshInterval = Config.getPref().getInt(C_REFRESH_INTERVAL, DEFAULT_REFRESH_INTERVAL);
 
-        centerInterval = Main.pref.getInt(C_CENTER_INTERVAL, DEFAULT_CENTER_INTERVAL);
-        centerFactor = Main.pref.getInt(C_CENTER_FACTOR, DEFAULT_CENTER_FACTOR);
+        centerInterval = Config.getPref().getInt(C_CENTER_INTERVAL, DEFAULT_CENTER_INTERVAL);
+        centerFactor = Config.getPref().getInt(C_CENTER_FACTOR, DEFAULT_CENTER_FACTOR);
         if (centerFactor <= 1 || centerFactor >= 99)
             centerFactor = DEFAULT_CENTER_FACTOR;
 
-            Main.pref.putInt(C_REFRESH_INTERVAL, refreshInterval);
-            Main.pref.putInt(C_CENTER_INTERVAL, centerInterval);
-        Main.pref.putInt(C_CENTER_FACTOR, (int) centerFactor);
+            Config.getPref().putInt(C_REFRESH_INTERVAL, refreshInterval);
+            Config.getPref().putInt(C_CENTER_INTERVAL, centerInterval);
+        Config.getPref().putInt(C_CENTER_FACTOR, (int) centerFactor);
 
         /*