Changeset 9242 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

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

Author:

simon04

Message:

fix #7670 - Add Overpass settings to main preference

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchOverpassObjectReader.java (modified) (2 diffs)
• MultiFetchServerObjectReader.java (modified) (3 diffs)

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());
     }