Changeset 12900 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

Don-vip

Message:

fix #15275 - Download dialog does not remember settings

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• DownloadDialog.java (modified) (4 diffs)
• DownloadSource.java (modified) (1 diff)
• OSMDownloadSource.java (modified) (3 diffs)
• OverpassDownloadSource.java (modified) (1 diff)

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

@@ -388 +388 @@
         }
 
+        downloadSourcesTab.getAllPanels().forEach(AbstractDownloadSourcePanel::restoreSettings);
         downloadSourcesTab.setSelected(DOWNLOAD_SOURCE_TAB.get());
 
@@ -486 +487 @@
      */
     protected <T> void addNewDownloadSourceTab(DownloadSource<T> downloadSource) {
-        downloadSourcesTab.addPanel(downloadSource.createPanel());
+        downloadSourcesTab.addPanel(downloadSource.createPanel(this));
     }
 
@@ -586 +587 @@
      * @since 12706
      */
-    private static class DownloadSourceTabs extends JTabbedPane implements DownloadSourceListener {
+    private class DownloadSourceTabs extends JTabbedPane implements DownloadSourceListener {
         private final List<AbstractDownloadSourcePanel<?>> allPanels = new ArrayList<>();
 
@@ -645 +646 @@
         @Override
         public void downloadSourceAdded(DownloadSource<?> source) {
-            addPanel(source.createPanel());
+            addPanel(source.createPanel(DownloadDialog.this));
         }
     }

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

@@ -13 +13 @@
     /**
      * Creates a panel with GUI specific for the download source.
+     * @param dialog the parent download dialog, as {@code DownloadDialog.getInstance()} might not be initialized yet
      * @return Returns {@link AbstractDownloadSourcePanel}.
+     * @since 12900
      */
-    AbstractDownloadSourcePanel<T> createPanel();
+    AbstractDownloadSourcePanel<T> createPanel(DownloadDialog dialog);
 
     /**

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

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

@@ -48 +48 @@
 
     @Override
-    public AbstractDownloadSourcePanel<OverpassDownloadData> createPanel() {
+    public AbstractDownloadSourcePanel<OverpassDownloadData> createPanel(DownloadDialog dialog) {
         return new OverpassDownloadSourcePanel(this);
     }