Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -79 +79 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ExifReader;
 import org.openstreetmap.josm.tools.GBC;
@@ -172 +173 @@
                 break;
             case DONE:
-                Main.pref.put("geoimage.timezone", timezone.formatTimezone());
-                Main.pref.put("geoimage.delta", delta.formatOffset());
-                Main.pref.putBoolean("geoimage.showThumbs", yLayer.useThumbs);
+                Config.getPref().put("geoimage.timezone", timezone.formatTimezone());
+                Config.getPref().put("geoimage.delta", delta.formatOffset());
+                Config.getPref().putBoolean("geoimage.showThumbs", yLayer.useThumbs);
 
                 yLayer.useThumbs = cbShowThumbs.isSelected();
@@ -421 +422 @@
             JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[vtTimezones.size()]));
 
-            String tzId = Main.pref.get("geoimage.timezoneid", "");
+            String tzId = Config.getPref().get("geoimage.timezoneid", "");
             TimeZone defaultTz;
             if (tzId.isEmpty()) {
@@ -529 +530 @@
                 String tzValue = selectedTz.substring(pos + 1, selectedTz.length() - 1);
 
-                Main.pref.put("geoimage.timezoneid", tzId);
+                Config.getPref().put("geoimage.timezoneid", tzId);
                 tfOffset.setText(Offset.milliseconds(delta).formatOffset());
                 tfTimezone.setText(tzValue);
@@ -584 +585 @@
 
         try {
-            timezone = Timezone.parseTimezone(Optional.ofNullable(Main.pref.get("geoimage.timezone", "0:00")).orElse("0:00"));
+            timezone = Timezone.parseTimezone(Optional.ofNullable(Config.getPref().get("geoimage.timezone", "0:00")).orElse("0:00"));
         } catch (ParseException e) {
             timezone = Timezone.ZERO;
@@ -593 +594 @@
 
         try {
-            delta = Offset.parseOffset(Main.pref.get("geoimage.delta", "0"));
+            delta = Offset.parseOffset(Config.getPref().get("geoimage.delta", "0"));
         } catch (ParseException e) {
             delta = Offset.ZERO;
@@ -627 +628 @@
         labelPosition.setEnabled(cbExifImg.isEnabled() || cbTaggedImg.isEnabled());
 
-        boolean ticked = yLayer.thumbsLoaded || Main.pref.getBoolean("geoimage.showThumbs", false);
+        boolean ticked = yLayer.thumbsLoaded || Config.getPref().getBoolean("geoimage.showThumbs", false);
         cbShowThumbs = new JCheckBox(tr("Show Thumbnail images on the map"), ticked);
         cbShowThumbs.setEnabled(!yLayer.thumbsLoaded);