Changeset 34466 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.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/OffsetDialog.java (modified) (11 diffs)

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

@@ -35 +35 @@
 import javax.swing.border.EmptyBorder;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.UserIdentityManager;
@@ -43 +42 @@
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -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.getInt("iodb.max.offsets", 4);
+    private static final int MAX_OFFSETS = Config.getPref().getInt("iodb.max.offsets", 4);
 
     /**
@@ -75 +75 @@
      */
     public OffsetDialog(List<ImageryOffsetBase> offsets) {
-        super(JOptionPane.getFrameForComponent(Main.parent), ImageryOffsetTools.DIALOG_TITLE,
+        super(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()), ImageryOffsetTools.DIALOG_TITLE,
                 MODAL ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
         setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
@@ -93 +93 @@
         updateButtonPanel();
         final JCheckBox calibrationBox = new JCheckBox(tr("Calibration geometries"));
-        calibrationBox.setSelected(Main.pref.getBoolean(PREF_CALIBRATION, true));
+        calibrationBox.setSelected(Config.getPref().getBoolean(PREF_CALIBRATION, true));
         calibrationBox.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Main.pref.putBoolean(PREF_CALIBRATION, calibrationBox.isSelected());
+                Config.getPref().putBoolean(PREF_CALIBRATION, calibrationBox.isSelected());
                 updateButtonPanel();
             }
         });
         final JCheckBox deprecatedBox = new JCheckBox(tr("Deprecated offsets"));
-        deprecatedBox.setSelected(Main.pref.getBoolean(PREF_DEPRECATED, false));
+        deprecatedBox.setSelected(Config.getPref().getBoolean(PREF_DEPRECATED, false));
         deprecatedBox.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Main.pref.putBoolean(PREF_DEPRECATED, deprecatedBox.isSelected());
+                Config.getPref().putBoolean(PREF_DEPRECATED, deprecatedBox.isSelected());
                 updateButtonPanel();
             }
@@ -128 +128 @@
         setContentPane(dialog);
         pack();
-        setLocationRelativeTo(Main.parent);
+        setLocationRelativeTo(MainApplication.getMainFrame());
     }
 
@@ -163 +163 @@
      */
     private List<ImageryOffsetBase> filterOffsets() {
-        boolean showCalibration = Main.pref.getBoolean(PREF_CALIBRATION, true);
-        boolean showDeprecated = Main.pref.getBoolean(PREF_DEPRECATED, false);
+        boolean showCalibration = Config.getPref().getBoolean(PREF_CALIBRATION, true);
+        boolean showDeprecated = Config.getPref().getBoolean(PREF_DEPRECATED, false);
         List<ImageryOffsetBase> filteredOffsets = new ArrayList<>();
         for (ImageryOffsetBase offset : offsets) {
@@ -246 +246 @@
         boolean closeDialog = MODAL || selectedOffset == null
                 || selectedOffset instanceof CalibrationObject
-                || Main.pref.getBoolean("iodb.close.on.select", true);
+                || Config.getPref().getBoolean("iodb.close.on.select", true);
         if (closeDialog) {
             MapView.removeZoomChangeListener(this);
@@ -275 +275 @@
             ImageryOffsetWatcher.getInstance().markGood();
             MainApplication.getMap().repaint();
-            if (!Main.pref.getBoolean("iodb.offset.message", false)) {
-                JOptionPane.showMessageDialog(Main.parent,
+            if (!Config.getPref().getBoolean("iodb.offset.message", false)) {
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("The topmost imagery layer has been shifted to presumably match\n"
                                 + "OSM data in the area. Please check that the offset is still valid\n"
                                 + "by downloading GPS tracks and comparing them and OSM data to the imagery."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
-                Main.pref.putBoolean("iodb.offset.message", true);
+                Config.getPref().putBoolean("iodb.offset.message", true);
             }
         } else if (selectedOffset instanceof CalibrationObject) {
@@ -287 +287 @@
             MainApplication.getLayerManager().addLayer(clayer);
             clayer.panToCenter();
-            if (!Main.pref.getBoolean("iodb.calibration.message", false)) {
-                JOptionPane.showMessageDialog(Main.parent,
+            if (!Config.getPref().getBoolean("iodb.calibration.message", false)) {
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("A layer has been added with a calibration geometry. Hide data layers,\n"
                                 + "find the corresponding feature on the imagery layer and move it accordingly."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
-                Main.pref.putBoolean("iodb.calibration.message", true);
+                Config.getPref().putBoolean("iodb.calibration.message", true);
             }
         }
@@ -332 +332 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            String base = Main.pref.get("url.openstreetmap-wiki", "https://wiki.openstreetmap.org/wiki/");
+            String base = Config.getPref().get("url.openstreetmap-wiki", "https://wiki.openstreetmap.org/wiki/");
             String lang = LanguageInfo.getWikiLanguagePrefix();
             String page = "Imagery_Offset_Database";