Changeset 34466 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

Timestamp:

2018-08-15T02:05:27+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 14153

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java (modified) (8 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

@@ -11 +11 @@
 import java.util.TreeMap;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -26 +26 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -49 +50 @@
      */
     private ImageryOffsetWatcher() {
-        maxDistance = Main.pref.getDouble("iodb.offset.radius", 15);
+        maxDistance = Config.getPref().getDouble("iodb.offset.radius", 15);
         MapView.addZoomChangeListener(this);
         MainApplication.getLayerManager().addLayerChangeListener(this);
@@ -224 +225 @@
     private void storeLayerOffset(AbstractTileSourceLayer<?> layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
-        if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
-            return;
-        List<String> offsets = new LinkedList<>(Main.pref.getList("iodb.stored.offsets"));
+        if (!Config.getPref().getBoolean("iodb.remember.offsets", true) || id == null)
+            return;
+        List<String> offsets = new LinkedList<>(Config.getPref().getList("iodb.stored.offsets"));
         for (Iterator<String> iter = offsets.iterator(); iter.hasNext();) {
             String[] offset = iter.next().split(":");
@@ -235 +236 @@
         offsets.add(id + ":" + center.lat() + ":" + center.lon() + ":" +
                 layer.getDisplaySettings().getDx() + ":" + layer.getDisplaySettings().getDy());
-        Main.pref.putList("iodb.stored.offsets", offsets);
+        Config.getPref().putList("iodb.stored.offsets", offsets);
     }
 
@@ -243 +244 @@
     private void loadLayerOffset(AbstractTileSourceLayer<?> layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
-        if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
-            return;
-        List<String> offsets = Main.pref.getList("iodb.stored.offsets");
+        if (!Config.getPref().getBoolean("iodb.remember.offsets", true) || id == null)
+            return;
+        List<String> offsets = Config.getPref().getList("iodb.stored.offsets");
         for (String offset : offsets) {
             String[] parts = offset.split(":");
@@ -260 +261 @@
                 if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) {
                     // apply offset
-                    OffsetBookmark bookmark = new OffsetBookmark(Main.getProjection().toCode(),
+                    OffsetBookmark bookmark = new OffsetBookmark(ProjectionRegistry.getProjection().toCode(),
                             null, layer.getName(), "Restored", dparts[2], dparts[3]);
                     layer.getDisplaySettings().setOffsetBookmark(bookmark);
@@ -278 +279 @@
         @Override
         public void run() {
-            maxDistance = Main.pref.getDouble("iodb.offset.radius", 15);
+            maxDistance = Config.getPref().getDouble("iodb.offset.radius", 15);
             checkOffset();
         }