Changeset 12900 in josm for trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

Timestamp:

2017-09-26T01:19:15+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15275 - Download dialog does not remember settings

File:

• trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java (modified) (3 diffs)

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

@@ -49 +49 @@
 
     @Override
-    public AbstractDownloadSourcePanel<OSMDownloadData> createPanel() {
-        return new OSMDownloadSourcePanel(this);
+    public AbstractDownloadSourcePanel<OSMDownloadData> createPanel(DownloadDialog dialog) {
+        return new OSMDownloadSourcePanel(this, dialog);
     }
 
@@ -145 +145 @@
         /**
          * Creates a new {@link OSMDownloadSourcePanel}.
+         * @param dialog the parent download dialog, as {@code DownloadDialog.getInstance()} might not be initialized yet
          * @param ds The osm download source the panel is for.
+         * @since 12900
          */
-        public OSMDownloadSourcePanel(OSMDownloadSource ds) {
+        public OSMDownloadSourcePanel(OSMDownloadSource ds, DownloadDialog dialog) {
             super(ds);
             setLayout(new GridBagLayout());
@@ -153 +155 @@
             // size check depends on selected data source
             final ChangeListener checkboxChangeListener = e ->
-                    DownloadDialog.getInstance().getSelectedDownloadArea().ifPresent(this::updateSizeCheck);
+                    dialog.getSelectedDownloadArea().ifPresent(this::updateSizeCheck);
 
             // adding the download tasks