Changeset 10252 in josm for trunk

Timestamp:

2016-05-18T19:31:26+02:00 (9 years ago)

Author:

Don-vip

Message:

partial revert of r10250 - causes NPE in OverpassDownloadDialog initialization

File:

• trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java (modified) (3 diffs)

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

@@ -120 +120 @@
     private static final class OverpassDownloadDialog extends DownloadDialog {
 
-        private final HistoryComboBox overpassWizard = new HistoryComboBox();
-        private final JosmTextArea overpassQuery = new JosmTextArea("", 8, 80);
+        private HistoryComboBox overpassWizard;
+        private JosmTextArea overpassQuery;
         private static OverpassDownloadDialog instance;
         private static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard",
@@ -151 +151 @@
 
             final String tooltip = tr("Builds an Overpass query using the Overpass Turbo query wizard");
+            overpassWizard = new HistoryComboBox();
             overpassWizard.setToolTipText(tooltip);
             overpassWizard.getEditorComponent().addFocusListener(disableActionsFocusListener);
@@ -177 +178 @@
             pnl.add(overpassWizard, GBC.eol().fill(GBC.HORIZONTAL));
 
+            overpassQuery = new JosmTextArea("", 8, 80);
             overpassQuery.setFont(GuiHelper.getMonospacedFont(overpassQuery));
             overpassQuery.addFocusListener(disableActionsFocusListener);