Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.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/io/importexport/GpxExporter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -36 +36 @@
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.GpxWriter;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -110 +111 @@
         p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH));
 
-        JCheckBox author = new JCheckBox(tr("Add author information"), Main.pref.getBoolean("lastAddAuthor", true));
+        JCheckBox author = new JCheckBox(tr("Add author information"), Config.getPref().getBoolean("lastAddAuthor", true));
         p.add(author, GBC.eol());
 
@@ -162 +163 @@
         setCanceled(false);
 
-        Main.pref.putBoolean("lastAddAuthor", author.isSelected());
+        Config.getPref().putBoolean("lastAddAuthor", author.isSelected());
         if (!authorName.getText().isEmpty()) {
-            Main.pref.put("lastAuthorName", authorName.getText());
+            Config.getPref().put("lastAuthorName", authorName.getText());
         }
         if (!copyright.getText().isEmpty()) {
-            Main.pref.put("lastCopyright", copyright.getText());
+            Config.getPref().put("lastCopyright", copyright.getText());
         }
 
@@ -231 +232 @@
             }
             if (copyright.getText().isEmpty()) {
-                copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet(
-                        () -> Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5")));
+                copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet(() -> Config.getPref().get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5")));
                 copyright.setCaretPosition(0);
             }
@@ -280 +280 @@
             emailLabel.setEnabled(b);
             if (b) {
-                authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Main.pref.get("lastAuthorName")));
-                email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Main.pref.get("lastAuthorEmail")));
+                authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Config.getPref().get("lastAuthorName")));
+                email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Config.getPref().get("lastAuthorEmail")));
             } else {
                 authorName.setText("");