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

Timestamp:

2017-08-26T00:08:24+02:00 (7 years ago)

Author:

michael2402

Message:

See #15167: Fix generics.

Location:

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

Files:

• AbstractDownloadSourcePanel.java (modified) (2 diffs)
• DownloadDialog.java (modified) (9 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.download;
 
-import org.openstreetmap.josm.data.Bounds;
+import java.util.Objects;
 
 import javax.swing.Icon;
 import javax.swing.JPanel;
-import java.util.Objects;
+
+import org.openstreetmap.josm.data.Bounds;
 
 /**
@@ -83 +84 @@
         // override this if the panel must react on bbox changes
     }
+
+    /**
+     * Tells the {@link DownloadSource} to start downloading
+     * @param currentBounds The bounds to download for
+     * @param downloadSettings The remaining download settings
+     */
+    public void triggerDownload(Bounds currentBounds, DownloadSettings downloadSettings) {
+        getDownloadSource().doDownload(currentBounds, getData(), downloadSettings);
+    }
 }

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

@@ -84 +84 @@
     }
 
-    protected final transient List<DownloadSource> downloadSources = new ArrayList<>();
+    protected final transient List<DownloadSource<?>> downloadSources = new ArrayList<>();
     protected final transient List<DownloadSelection> downloadSelections = new ArrayList<>();
     protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
@@ -273 +273 @@
         for (Component ds : downloadSourcesTab.getComponents()) {
             if (ds instanceof AbstractDownloadSourcePanel) {
-                ((AbstractDownloadSourcePanel) ds).boudingBoxChanged(b);
+                ((AbstractDownloadSourcePanel<?>) ds).boudingBoxChanged(b);
             }
         }
@@ -379 +379 @@
             tpDownloadAreaSelectors.setSelectedIndex(DOWNLOAD_TAB.get());
         } catch (IndexOutOfBoundsException e) {
-            Main.trace(e);
+            Logging.trace(e);
             tpDownloadAreaSelectors.setSelectedIndex(0);
         }
@@ -386 +386 @@
             downloadSourcesTab.setSelectedIndex(DOWNLOAD_SOURCE_TAB.get());
         } catch (IndexOutOfBoundsException e) {
-            Main.trace(e);
+            Logging.trace(e);
             downloadSourcesTab.setSelectedIndex(0);
         }
@@ -485 +485 @@
      * @return The index of the download source, or -1 if it not in the pane.
      */
-    protected int getDownloadSourceIndex(DownloadSource downloadSource) {
+    protected int getDownloadSourceIndex(DownloadSource<?> downloadSource) {
         return Arrays.stream(downloadSourcesTab.getComponents())
                 .filter(it -> it instanceof AbstractDownloadSourcePanel)
-                .map(it -> (AbstractDownloadSourcePanel) it)
+                .map(it -> (AbstractDownloadSourcePanel<?>) it)
                 .filter(it -> it.getDownloadSource().equals(downloadSource))
                 .findAny()
@@ -528 +528 @@
                         .mapToObj(downloadSourcesTab::getComponentAt)
                         .filter(it -> it instanceof AbstractDownloadSourcePanel)
-                        .map(it -> (AbstractDownloadSourcePanel) it)
+                        .map(it -> (AbstractDownloadSourcePanel<?>) it)
                         .filter(it -> it.getDownloadSource().onlyExpert())
                         .forEach(downloadSourcesTab::remove);
@@ -552 +552 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            AbstractDownloadSourcePanel pnl = (AbstractDownloadSourcePanel) downloadSourcesTab.getSelectedComponent();
+            AbstractDownloadSourcePanel<?> pnl = (AbstractDownloadSourcePanel<?>) downloadSourcesTab.getSelectedComponent();
             run();
             pnl.checkCancel();
@@ -572 +572 @@
             Component panel = downloadSourcesTab.getSelectedComponent();
             if (panel instanceof AbstractDownloadSourcePanel) {
-                AbstractDownloadSourcePanel pnl = (AbstractDownloadSourcePanel) panel;
+                AbstractDownloadSourcePanel<?> pnl = (AbstractDownloadSourcePanel<?>) panel;
                 DownloadSettings downloadSettings = getDownloadSettings();
                 if (pnl.checkDownload(currentBounds, downloadSettings)) {
@@ -578 +578 @@
                     setCanceled(false);
                     setVisible(false);
-                    pnl.getDownloadSource().doDownload(currentBounds, pnl.getData(), downloadSettings);
+                    pnl.triggerDownload(currentBounds, downloadSettings);
                 }
             }