Changeset 9242 in josm for trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
- Timestamp:
- 2016-01-01T19:42:27+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
r9241 r9242 15 15 import java.awt.event.KeyEvent; 16 16 import java.util.ArrayList; 17 import java.util.Arrays;18 17 import java.util.Collection; 19 18 import java.util.Collections; … … 41 40 import org.openstreetmap.josm.data.preferences.CollectionProperty; 42 41 import org.openstreetmap.josm.data.preferences.IntegerProperty; 43 import org.openstreetmap.josm.data.preferences.StringProperty;44 42 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 45 43 import org.openstreetmap.josm.gui.download.DownloadDialog; 44 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference; 46 45 import org.openstreetmap.josm.gui.util.GuiHelper; 47 46 import org.openstreetmap.josm.gui.widgets.HistoryComboBox; … … 58 57 */ 59 58 public class OverpassDownloadAction extends JosmAction { 60 61 /**62 * The {@link StringProperty property} of the currently selected Overpass server.63 *64 * @since 924165 */66 public static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");67 59 68 60 /** … … 88 80 DownloadOsmTask task = new DownloadOsmTask(); 89 81 Future<?> future = task.download( 90 new OverpassDownloadReader(area, dialog.getOverpassServer(), dialog.getOverpassQuery()),82 new OverpassDownloadReader(area, OverpassServerPreference.getOverpassServer(), dialog.getOverpassQuery()), 91 83 dialog.isNewLayerRequired(), area, null); 92 84 Main.worker.submit(new PostDownloadHandler(task, future)); … … 124 116 private static final class OverpassDownloadDialog extends DownloadDialog { 125 117 126 private HistoryComboBox overpassServer;127 118 private HistoryComboBox overpassWizard; 128 119 private JosmTextArea overpassQuery; 129 120 private static OverpassDownloadDialog instance; 130 private static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",131 Arrays.asList("http://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));132 121 private static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard", 133 122 new ArrayList<String>()); … … 203 192 pnl.add(pane, gbc); 204 193 205 overpassServer = new HistoryComboBox();206 overpassServer.getEditor().getEditorComponent().addFocusListener(disableActionsFocusListener);207 pnl.add(new JLabel(tr("Overpass server: ")), GBC.std().insets(5, 5, 5, 5));208 pnl.add(overpassServer, GBC.eol().fill(GBC.HORIZONTAL));209 }210 211 public String getOverpassServer() {212 return overpassServer.getText();213 194 } 214 195 … … 224 205 public void restoreSettings() { 225 206 super.restoreSettings(); 226 overpassServer.setPossibleItems(OVERPASS_SERVER_HISTORY.get());227 overpassServer.setText(OVERPASS_SERVER.get());228 207 overpassWizard.setPossibleItems(OVERPASS_WIZARD_HISTORY.get()); 229 208 } … … 233 212 super.rememberSettings(); 234 213 overpassWizard.addCurrentItemToHistory(); 235 OVERPASS_SERVER.put(getOverpassServer());236 OVERPASS_SERVER_HISTORY.put(overpassServer.getHistory());237 214 OVERPASS_WIZARD_HISTORY.put(overpassWizard.getHistory()); 238 215 OverpassQueryHistoryPopup.addToHistory(getOverpassQuery());
Note:
See TracChangeset
for help on using the changeset viewer.