Revert "Don't load remote images in the EDT"

This reverts commit 00b7926810.

Change-Id: Ic46e4185df7959ae8723adf2c1167a67c4fb450b
Reviewed-on: http://gerrit.dmdirc.com/1980
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonTable.java

@@ -87,7 +87,7 @@ public class AddonTable extends JTable {
     /** {@inheritDoc} */
     @Override
     public void setRowSorter(final RowSorter<? extends TableModel> sorter) {
-        if (sorter != null && !(sorter instanceof AddonSorter)) {
+        if (!(sorter instanceof AddonSorter)) {
             throw new IllegalArgumentException(
                     "Row sorter must be of type AddonSorter");
         }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -95,6 +97,9 @@ public class BrowserWindow extends JDialog implements ActionListener {
         setResizable(false);
         setLayout(new MigLayout("fill, wmin 650, hmin 600"));
         scrollPane.getVerticalScrollBar().setUnitIncrement(15);
+        final JPanel loadingPanel = new JPanel(
+                new MigLayout("filly, alignx 50%"));
+        loadingPanel.add(new TextLabel("Loading addons, please wait."));
 
         JPanel panel = new JPanel(new MigLayout("fill"));
         panel.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
@@ -146,7 +151,8 @@ public class BrowserWindow extends JDialog implements ActionListener {
         list.setRowSorter(sorter);
         list.setShowGrid(false);
 
-        loadData(true);
+        scrollPane.setViewportView(loadingPanel);
+        loadData();
 
         pack();
         setLocationRelativeTo(parentWindow);
@@ -183,12 +189,9 @@ public class BrowserWindow extends JDialog implements ActionListener {
 
     /**
      * Loads addon data from the locally cached feed file.
-     *
-     * @param download Download new addon feed?
      */
-    public final void loadData(final boolean download) {
-        new DataLoaderWorker(list, download, this, scrollPane)
-                .executeInExecutor();
+    public final void loadData() {
+        new DataLoaderWorker(list, this, scrollPane).executeInExecutor();
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -23,39 +23,25 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.ConfigFile;
-import com.dmdirc.util.DownloadListener;
-import com.dmdirc.util.Downloader;
 import com.dmdirc.util.InvalidConfigFileException;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import javax.swing.Box;
-
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
-import javax.swing.text.StyleConstants;
-
-import net.miginfocom.swing.MigLayout;
 
 /**
  * Loads the addon data feed into the addon browser.
  */
 public class DataLoaderWorker
-        extends LoggingSwingWorker<Collection<AddonInfo>, Object>
-        implements DownloadListener {
+        extends LoggingSwingWorker<Collection<Map<String, String>>, Object> {
 
     /** List to load data into. */
     private final AddonTable table;
@@ -63,24 +49,18 @@ public class DataLoaderWorker
     private final BrowserWindow browserWindow;
     /** Table's parent scrollpane. */
     private final JScrollPane scrollPane;
-    /** Downloader progress bar. */
-    private final JProgressBar jpb = new JProgressBar(0, 100);
-    /** Refresh addons feed? */
-    private final boolean download;
 
     /**
      * Creates a new data loader worker.
      *
      * @param table Table to load data into
-     * @param download Download new addons feed?
      * @param browserWindow Browser window to pass to table objects
      * @param scrollPane Table's parent scrollpane
      */
-    public DataLoaderWorker(final AddonTable table, final boolean download,
+    public DataLoaderWorker(final AddonTable table,
             final BrowserWindow browserWindow, final JScrollPane scrollPane) {
         super();
 
-        this.download = download;
         this.table = table;
         this.browserWindow = browserWindow;
         this.scrollPane = scrollPane;
@@ -88,46 +68,17 @@ public class DataLoaderWorker
 
     /** {@inheritDoc} */
     @Override
-    protected Collection<AddonInfo> doInBackground() {
-        final JPanel loadingPanel = new JPanel(
-                new MigLayout("fill, alignx 50%, aligny 50%"));
-        scrollPane.setViewportView(loadingPanel);
-        if (download) {
-            final TextLabel label = new TextLabel(
-                    "Downloading addon info, please wait...");
-            label.setAlignment(StyleConstants.ALIGN_CENTER);
-            loadingPanel.add(Box.createVerticalGlue(), "growy, pushy, wrap");
-            loadingPanel.add(label, "growx, wrap");
-            loadingPanel.add(jpb, "growx, wrap");
-            loadingPanel.add(Box.createVerticalGlue(), "growy, pushy");
-            try {
-                Downloader.downloadPage("http://addons.dmdirc.com/feed",
-                        Main.getConfigDir() + File.separator + "addons.feed",
-                        this);
-            } catch (IOException ex) {
-                loadingPanel.removeAll();
-                loadingPanel.add(new TextLabel("Unable to download feeds."));
-                return Collections.<AddonInfo>emptyList();
-            }
-        }
-
-        loadingPanel.removeAll();
-        loadingPanel.add(new TextLabel("Loading addon info, please wait."));
+    protected Collection<Map<String, String>> doInBackground() {
         final ConfigFile data = new ConfigFile(Main.getConfigDir()
                 + File.separator + "addons.feed");
         try {
             data.read();
         } catch (IOException ex) {
-            return Collections.<AddonInfo>emptyList();
+            return Collections.<Map<String, String>>emptyList();
         } catch (InvalidConfigFileException ex) {
-            return Collections.<AddonInfo>emptyList();
+            return Collections.<Map<String, String>>emptyList();
         }
-
-        final List<AddonInfo> list = new ArrayList<AddonInfo>();
-        for (Map<String, String> entry : data.getKeyDomains().values()) {
-            list.add(new AddonInfo(entry));
-        }
-        return list;
+        return data.getKeyDomains().values();
     }
 
     /** {@inheritDoc} */
@@ -136,15 +87,14 @@ public class DataLoaderWorker
         if (isCancelled()) {
             return;
         }
-
-        Collection<AddonInfo> data;
+        Collection<Map<String, String>> data;
         try {
             data = get();
         } catch (InterruptedException ex) {
-            data = Collections.<AddonInfo>emptyList();
+            data = Collections.<Map<String, String>>emptyList();
         } catch (ExecutionException ex) {
             Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
-            data = Collections.<AddonInfo>emptyList();
+            data = Collections.<Map<String, String>>emptyList();
         }
         final int selectedRow;
         if (table.getRowCount() > 0 && table.getSelectedRow() > 0) {
@@ -153,7 +103,8 @@ public class DataLoaderWorker
             selectedRow = 0;
         }
         table.getModel().setRowCount(0);
-        for (AddonInfo info : data) {
+        for (Map<String, String> entry : data) {
+            final AddonInfo info = new AddonInfo(entry);
             table.getModel().addRow(new Object[]{
                 new AddonInfoLabel(info, browserWindow),
             });
@@ -161,31 +112,4 @@ public class DataLoaderWorker
         table.getSelectionModel().setSelectionInterval(selectedRow, selectedRow);
         scrollPane.setViewportView(table);
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void downloadProgress(final float percent) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                jpb.setValue((int) percent);
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setIndeterminate(final boolean indeterminate) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                jpb.setIndeterminate(indeterminate);
-            }
-        });
-   }
-
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DownloaderWindow.java

@@ -0,0 +1,112 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonbrowser;
+
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.CoreUIUtils;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.util.DownloadListener;
+import com.dmdirc.util.Downloader;
+
+import java.awt.Window;
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JProgressBar;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Simple window to show download progress on addon feed.
+ */
+public class DownloaderWindow extends JDialog implements Runnable, DownloadListener {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    /** Downloader progress bar. */
+    private final JProgressBar jpb = new JProgressBar(0, 100);
+    /** Parent window. */
+    private final Window parentWindow;
+
+    /**
+     * Instantiates a new downloader window.
+     *
+     * @param parentWindow Parent window
+     * @param controller Swing controller
+     */
+    public DownloaderWindow(final Window parentWindow,
+            final SwingController controller) {
+        super(parentWindow, "DMDirc Addon Browser", ModalityType.MODELESS);
+        this.parentWindow = parentWindow;
+        setTitle("Downloading addon information...");
+        setLayout(new MigLayout("fill"));
+        add(jpb, "grow");
+        pack();
+        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        CoreUIUtils.centreWindow(this);
+        setIconImage(IconManager.getIconManager().getImage("icon"));
+        setVisible(true);
+
+        new Thread(this, "Addon downloader thread").start();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void run() {
+        try {
+            Downloader.downloadPage("http://addons.dmdirc.com/feed",
+                    Main.getConfigDir() + File.separator + "addons.feed", this);
+            UIUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    new BrowserWindow(parentWindow);
+                }
+            });
+        } catch (IOException ex) {
+            removeAll();
+            add(new JLabel("Unable to download feed."));
+        }
+
+        dispose();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void downloadProgress(final float percent) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                jpb.setValue((int) percent);
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setIndeterminate(final boolean indeterminate) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                jpb.setIndeterminate(indeterminate);
+            }
+        });
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java

@@ -106,6 +106,6 @@ public class InstallerWindow extends StandardDialog implements ActionListener {
         jpb.setValue(100);
         getOkButton().setEnabled(true);
         pack();
-        parentWindow.loadData(false);
+        parentWindow.loadData();
     }
 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
+import com.dmdirc.addons.ui_swing.components.addonbrowser.DownloaderWindow;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
@@ -211,7 +211,7 @@ public abstract class AddonPanel extends JPanel implements
 
             addonList.repaint();
         } else if (e.getSource() != toggleButton) {
-            new BrowserWindow(parentWindow);
+            new DownloaderWindow(parentWindow, controller);
         }
     }