Changeset 12878 in josm for trunk/src/org

Timestamp:

2017-09-19T21:17:54+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15264 - change DownloadDialog.addDownloadSource() to a static method so that plugins can add their own sources without creating an instance of the download dialog

Location:

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

Files:

• DownloadDialog.java (modified) (7 diffs)
• DownloadSourceListener.java (added)

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

@@ -55 +55 @@
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -84 +85 @@
     }
 
-    protected final transient List<DownloadSource<?>> downloadSources = new ArrayList<>();
+    protected static final ListenerList<DownloadSourceListener> downloadSourcesListeners = ListenerList.create();
+    protected static final List<DownloadSource<?>> downloadSources = new ArrayList<>();
+    static {
+        // add default download sources
+        addDownloadSource(new OSMDownloadSource());
+        addDownloadSource(new OverpassDownloadSource());
+    }
+
     protected final transient List<DownloadSelection> downloadSelections = new ArrayList<>();
     protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
@@ -114 +122 @@
     protected final JPanel buildMainPanel() {
         mainPanel = new JPanel(new GridBagLayout());
-
-        // add default download sources
-        addDownloadSource(new OSMDownloadSource());
-        addDownloadSource(new OverpassDownloadSource());
 
         // must be created before hook
@@ -335 +339 @@
      * @throws JosmRuntimeException If the download source is already added. Note, download sources are
      * compared by their reference.
-     */
-    public <T> void addDownloadSource(DownloadSource<T> downloadSource) {
+     * @since 12878
+     */
+    public static <T> void addDownloadSource(DownloadSource<T> downloadSource) {
         if (downloadSources.contains(downloadSource)) {
             throw new JosmRuntimeException("The download source you are trying to add already exists.");
@@ -342 +347 @@
 
         downloadSources.add(downloadSource);
-        addNewDownloadSourceTab(downloadSource);
+        downloadSourcesListeners.fireEvent(l -> l.downloadSourceAdded(downloadSource));
     }
 
@@ -581 +586 @@
      * @since 12706
      */
-    private static class DownloadSourceTabs extends JTabbedPane {
+    private static class DownloadSourceTabs extends JTabbedPane implements DownloadSourceListener {
         private final List<AbstractDownloadSourcePanel<?>> allPanels = new ArrayList<>();
+
+        DownloadSourceTabs() {
+            downloadSources.forEach(this::downloadSourceAdded);
+            downloadSourcesListeners.addListener(this);
+        }
 
         List<AbstractDownloadSourcePanel<?>> getAllPanels() {
@@ -631 +641 @@
             }
             super.insertTab(title, icon, component, tip, index);
+        }
+
+        @Override
+        public void downloadSourceAdded(DownloadSource<?> source) {
+            addPanel(source.createPanel());
         }
     }