Changeset 33774 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

Timestamp:

2017-11-05T19:09:17+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12840

File:

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

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

@@ -37 +37 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -57 +57 @@
     protected static final String PREF_CALIBRATION = "iodb.show.calibration";
     protected static final String PREF_DEPRECATED = "iodb.show.deprecated";
-    private static final int MAX_OFFSETS = Main.pref.getInteger("iodb.max.offsets", 4);
+    private static final int MAX_OFFSETS = Main.pref.getInt("iodb.max.offsets", 4);
 
     /**
@@ -97 +97 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                Main.pref.put(PREF_CALIBRATION, calibrationBox.isSelected());
+                Main.pref.putBoolean(PREF_CALIBRATION, calibrationBox.isSelected());
                 updateButtonPanel();
             }
@@ -106 +106 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                Main.pref.put(PREF_DEPRECATED, deprecatedBox.isSelected());
+                Main.pref.putBoolean(PREF_DEPRECATED, deprecatedBox.isSelected());
                 updateButtonPanel();
             }
@@ -271 +271 @@
     public void applyOffset() {
         if (selectedOffset instanceof ImageryOffset) {
-            AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+            AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
             ImageryOffsetTools.applyLayerOffset(layer, (ImageryOffset) selectedOffset);
             ImageryOffsetWatcher.getInstance().markGood();
@@ -281 +281 @@
                                 + "by downloading GPS tracks and comparing them and OSM data to the imagery."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
-                Main.pref.put("iodb.offset.message", true);
+                Main.pref.putBoolean("iodb.offset.message", true);
             }
         } else if (selectedOffset instanceof CalibrationObject) {
@@ -292 +292 @@
                                 + "find the corresponding feature on the imagery layer and move it accordingly."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
-                Main.pref.put("iodb.calibration.message", true);
+                Main.pref.putBoolean("iodb.calibration.message", true);
             }
         }
@@ -315 +315 @@
         @Override
         public void queryPassed() {
-            offset.setDeprecated(new Date(), JosmUserIdentityManager.getInstance().getUserName(), "");
+            offset.setDeprecated(new Date(), UserIdentityManager.getInstance().getUserName(), "");
             updateButtonPanel();
         }