Changeset 34526 in osm for applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java

Timestamp:

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

Author:

donvip

Message:

update to JOSM 14153

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (modified) (3 diffs)

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);
 
         /*