Changeset 9242 in josm for trunk/src

Timestamp:

2016-01-01T19:42:27+01:00 (9 years ago)

Author:

simon04

Message:

fix #7670 - Add Overpass settings to main preference

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (8 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (2 diffs)
• gui/preferences/server/OverpassServerPreference.java (added)
• io/MultiFetchOverpassObjectReader.java (modified) (2 diffs)
• io/MultiFetchServerObjectReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java

@@ -15 +15 @@
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -41 +40 @@
 import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
+import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
@@ -58 +57 @@
  */
 public class OverpassDownloadAction extends JosmAction {
-
-    /**
-     * The {@link StringProperty property} of the currently selected Overpass server.
-     *
-     * @since 9241
-     */
-    public static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");
 
     /**
@@ -88 +80 @@
             DownloadOsmTask task = new DownloadOsmTask();
             Future<?> future = task.download(
-                    new OverpassDownloadReader(area, dialog.getOverpassServer(), dialog.getOverpassQuery()),
+                    new OverpassDownloadReader(area, OverpassServerPreference.getOverpassServer(), dialog.getOverpassQuery()),
                     dialog.isNewLayerRequired(), area, null);
             Main.worker.submit(new PostDownloadHandler(task, future));
@@ -124 +116 @@
     private static final class OverpassDownloadDialog extends DownloadDialog {
 
-        private HistoryComboBox overpassServer;
         private HistoryComboBox overpassWizard;
         private JosmTextArea overpassQuery;
         private static OverpassDownloadDialog instance;
-        private static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
-                Arrays.asList("http://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));
         private static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard",
                 new ArrayList<String>());
@@ -203 +192 @@
             pnl.add(pane, gbc);
 
-            overpassServer = new HistoryComboBox();
-            overpassServer.getEditor().getEditorComponent().addFocusListener(disableActionsFocusListener);
-            pnl.add(new JLabel(tr("Overpass server: ")), GBC.std().insets(5, 5, 5, 5));
-            pnl.add(overpassServer, GBC.eol().fill(GBC.HORIZONTAL));
-        }
-
-        public String getOverpassServer() {
-            return overpassServer.getText();
         }
 
@@ -224 +205 @@
         public void restoreSettings() {
             super.restoreSettings();
-            overpassServer.setPossibleItems(OVERPASS_SERVER_HISTORY.get());
-            overpassServer.setText(OVERPASS_SERVER.get());
             overpassWizard.setPossibleItems(OVERPASS_WIZARD_HISTORY.get());
         }
@@ -233 +212 @@
             super.rememberSettings();
             overpassWizard.addCurrentItemToHistory();
-            OVERPASS_SERVER.put(getOverpassServer());
-            OVERPASS_SERVER_HISTORY.put(overpassServer.getHistory());
             OVERPASS_WIZARD_HISTORY.put(overpassWizard.getHistory());
             OverpassQueryHistoryPopup.addToHistory(getOverpassQuery());

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.preferences.remotecontrol.RemoteControlPreference;
 import org.openstreetmap.josm.gui.preferences.server.AuthenticationPreference;
+import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
@@ -561 +562 @@
         settingsFactories.add(new AuthenticationPreference.Factory());
         settingsFactories.add(new ProxyPreference.Factory());
+        settingsFactories.add(new OverpassServerPreference.Factory());
         settingsFactories.add(new MapPreference.Factory());
         settingsFactories.add(new ProjectionPreference.Factory());

trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import org.openstreetmap.josm.actions.OverpassDownloadAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -29 +29 @@
     @Override
     protected String getBaseUrl() {
-        return OverpassDownloadAction.OVERPASS_SERVER.get();
+        return OverpassServerPreference.getOverpassServer();
     }
 }

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -85 +86 @@
     /**
      * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
-     * depending on the {@code download.overpass.for-multi-fetch} preference.
+     * depending on the {@link OverpassServerPreference#useForMultiFetch preference}.
      *
      * @return a new instance
@@ -91 +92 @@
      */
     public static MultiFetchServerObjectReader create() {
-        return create(Main.pref.getBoolean("download.overpass.for-multi-fetch", false));
+        return create(OverpassServerPreference.useForMultiFetch());
     }