Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkList.java (modified) (4 diffs)
• DownloadDialog.java (modified) (3 diffs)
• DownloadObjectDialog.java (modified) (3 diffs)
• DownloadSettings.java (modified) (1 diff)
• OSMDownloadSource.java (modified) (3 diffs)
• OverpassQueryList.java (modified) (3 diffs)
• PlaceSelection.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -23 +23 @@
 import javax.swing.UIManager;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.ChangesetQueryTask;
 import org.openstreetmap.josm.data.Bounds;
@@ -39 +38 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -262 +262 @@
         }
         // Then add manual bookmarks previously saved in local preferences
-        Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
+        List<List<String>> args = Config.getPref().getListOfLists("bookmarks", null);
         if (args != null) {
             List<Bookmark> bookmarks = new LinkedList<>();
@@ -315 +315 @@
             coll.add(Arrays.asList(array));
         }
-        Main.pref.putListOfLists("bookmarks", coll);
+        Config.getPref().putListOfLists("bookmarks", coll);
     }
 

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -50 +50 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -363 +364 @@
         DOWNLOAD_ZOOMTODATA.put(cbZoomToDownloadedData.isSelected());
         if (currentBounds != null) {
-            Main.pref.put("osm-download.bounds", currentBounds.encodeAsString(";"));
+            Config.getPref().put("osm-download.bounds", currentBounds.encodeAsString(";"));
         }
     }
@@ -406 +407 @@
      */
     public static Bounds getSavedDownloadBounds() {
-        String value = Main.pref.get("osm-download.bounds");
+        String value = Config.getPref().get("osm-download.bounds");
         if (!value.isEmpty()) {
             try {

trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -59 +60 @@
     protected Collection<Component> getComponentsBeforeHelp() {
         newLayer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
-        newLayer.setSelected(Main.pref.getBoolean("download.newlayer"));
+        newLayer.setSelected(Config.getPref().getBoolean("download.newlayer"));
 
         referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.,"
                 + "parent relations and for nodes, additionally, parent ways"));
-        referrers.setSelected(Main.pref.getBoolean("downloadprimitive.referrers", true));
+        referrers.setSelected(Config.getPref().getBoolean("downloadprimitive.referrers", true));
 
         fullRel.setToolTipText(tr("Select if the members of a relation should be downloaded as well"));
-        fullRel.setSelected(Main.pref.getBoolean("downloadprimitive.full", true));
+        fullRel.setSelected(Config.getPref().getBoolean("downloadprimitive.full", true));
 
         cbType.addItemListener(e -> referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
@@ -103 +104 @@
         super.windowClosed(e);
         if (e != null && e.getComponent() == this && getValue() == 1) {
-            Main.pref.putBoolean("downloadprimitive.referrers", referrers.isSelected());
-            Main.pref.putBoolean("downloadprimitive.full", fullRel.isSelected());
-            Main.pref.putBoolean("download.newlayer", newLayer.isSelected());
+            Config.getPref().putBoolean("downloadprimitive.referrers", referrers.isSelected());
+            Config.getPref().putBoolean("downloadprimitive.full", fullRel.isSelected());
+            Config.getPref().putBoolean("download.newlayer", newLayer.isSelected());
         }
     }

trunk/src/org/openstreetmap/josm/gui/download/DownloadSettings.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.download;
 
+import java.util.Optional;
+
 import org.openstreetmap.josm.data.Bounds;
-
-import java.util.Optional;
 
 /**

trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

@@ -19 +19 @@
 import javax.swing.event.ChangeListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.AbstractDownloadTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
@@ -32 +31 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -298 +298 @@
             } else if (isDownloadNotes() && !isDownloadOsmData() && !isDownloadGpxData()) {
                 // see max_note_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
-                isAreaTooLarge = bbox.getArea() > Main.pref.getDouble("osm-server.max-request-area-notes", 25);
+                isAreaTooLarge = bbox.getArea() > Config.getPref().getDouble("osm-server.max-request-area-notes", 25);
             } else {
                 // see max_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
-                isAreaTooLarge = bbox.getArea() > Main.pref.getDouble("osm-server.max-request-area", 0.25);
+                isAreaTooLarge = bbox.getArea() > Config.getPref().getDouble("osm-server.max-request-area", 0.25);
             }
 

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -254 +255 @@
         }
 
-        Main.pref.putListOfMaps(PREFERENCE_ITEMS, toSave);
+        Config.getPref().putListOfMaps(PREFERENCE_ITEMS, toSave);
     }
 
@@ -263 +264 @@
     private static Map<String, SelectorItem> restorePreferences() {
         Collection<Map<String, String>> toRetrieve =
-                Main.pref.getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
+                Config.getPref().getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList());
         Map<String, SelectorItem> result = new HashMap<>();
 

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -55 +55 @@
 import org.openstreetmap.josm.io.NameFinder.SearchResult;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -105 +106 @@
         lpanel.add(new JLabel(tr("Choose the server for searching:")));
         lpanel.add(server);
-        String s = Main.pref.get("namefinder.server", SERVERS[0].name);
+        String s = Config.getPref().get("namefinder.server", SERVERS[0].name);
         for (int i = 0; i < SERVERS.length; ++i) {
             if (SERVERS[i].name.equals(s)) {
@@ -115 +116 @@
         cbSearchExpression = new HistoryComboBox();
         cbSearchExpression.setToolTipText(tr("Enter a place name to search for"));
-        List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(Config.getPref().getList(HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(cmtHistory);
         cbSearchExpression.setPossibleItems(cmtHistory);
@@ -189 +190 @@
                 return;
             cbSearchExpression.addCurrentItemToHistory();
-            Main.pref.putList(HISTORY_KEY, cbSearchExpression.getHistory());
+            Config.getPref().putList(HISTORY_KEY, cbSearchExpression.getHistory());
             NameQueryTask task = new NameQueryTask(cbSearchExpression.getText());
             MainApplication.worker.submit(task);
@@ -227 +228 @@
             this.searchExpression = searchExpression;
             useserver = (Server) server.getSelectedItem();
-            Main.pref.put("namefinder.server", useserver.name);
+            Config.getPref().put("namefinder.server", useserver.name);
         }