Fixes issue 3777: Addon browser needs to show feedback when installing/finished

Change-Id: Ie0a8c56c2ef8eb65c4d7154f91bd87f46de6fd95
Reviewed-on: http://gerrit.dmdirc.com/883
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -27,6 +27,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Window;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -47,15 +48,20 @@ public class AddonInfoLabel extends JPanel {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Addon info to be represented. */
     private final AddonInfo addonInfo;
+    /** Parent window. */
+    private Window parentWindow;
 
     /**
      * Creates a new addon info label to describe the specified addon info.
      *
      * @param addonInfo Addon to describe
+     * @param parentWindow Parent window
      */
-    public AddonInfoLabel(final AddonInfo addonInfo) {
+    public AddonInfoLabel(final AddonInfo addonInfo, final Window parentWindow) {
         this.addonInfo = addonInfo;
+        this.parentWindow = parentWindow;
 
         init();
     }
@@ -80,7 +86,7 @@ public class AddonInfoLabel extends JPanel {
         add(label, "wmax 100%-170, hmax 150, growy, wrap, pushy, gapleft 5");
 
         final JButton button = new JButton("Install");
-        button.addActionListener(new InstallListener(addonInfo));
+        button.addActionListener(new InstallListener(addonInfo, parentWindow));
         final boolean installed = addonInfo.isInstalled();
         add(button, "split, gapleft 5");
 

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

@@ -210,7 +210,7 @@ public class BrowserWindow extends JDialog implements ActionListener {
 
         for (Map<String, String> entry : data.getKeyDomains().values()) {
             final AddonInfo info = new AddonInfo(entry);
-            list.getModel().addRow(new Object[]{new AddonInfoLabel(info),});
+            list.getModel().addRow(new Object[]{new AddonInfoLabel(info, this),});
         }
     }
 

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

@@ -30,11 +30,13 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.util.Downloader;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import java.io.File;
 import java.io.IOException;
+import javax.swing.SwingUtilities;
 
 /**
  * Addon info install listener.
@@ -43,14 +45,18 @@ public class InstallListener implements ActionListener {
 
     /** Addon info. */
     private final AddonInfo info;
+    /** Parent window. */
+    private Window parentWindow;
 
     /**
      * Instantiates a new install listener.
      * 
      * @param info Addoninfo to install
+     * @param parentWindow Parent window
      */
-    public InstallListener(final AddonInfo info) {
+    public InstallListener(final AddonInfo info, final Window parentWindow) {
         this.info = info;
+        this.parentWindow = parentWindow;
     }
 
     /** 
@@ -60,6 +66,14 @@ public class InstallListener implements ActionListener {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
+        final InstallerWindow installer = new InstallerWindow(parentWindow, info);
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                installer.display(parentWindow);
+            }
+        });
         try {
             final File file = File.createTempFile("dmdirc-addon", ".tmp");
             file.deleteOnExit();
@@ -87,6 +101,9 @@ public class InstallListener implements ActionListener {
                         Logger.userError(ErrorLevel.MEDIUM, "Unable to "
                                 + "install addon, failed to move file: "
                                 + file.getAbsolutePath());
+                        installer.finished("Unable to "
+                                + "install addon, failed to move file: "
+                                + file.getAbsolutePath());
                     }
                     break;
                 case TYPE_THEME:
@@ -96,6 +113,8 @@ public class InstallListener implements ActionListener {
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to download addon: "
                     + ex.getMessage(), ex);
+            installer.finished("Unable to download addon: " + ex.getMessage());
         }
+        installer.finished("");
     }
 }

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonbrowser;
+
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+
+import java.awt.Dialog.ModalityType;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JDialog;
+import javax.swing.JProgressBar;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A window to show the progress whilst installing an addon.
+ */
+public class InstallerWindow extends StandardDialog implements ActionListener {
+
+    /**
+     * 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 Window parentWindow;
+    /** Message label. */
+    private TextLabel label;
+    /** Addon info. */
+    private AddonInfo info;
+
+    /**
+     * Instantiates a new installer window.
+     *
+     * @param parentWindow Parent window
+     * @param info Assocaited addon info
+     */
+    public InstallerWindow(final Window parentWindow, final AddonInfo info) {
+        super(parentWindow, ModalityType.DOCUMENT_MODAL);
+        this.info = info;
+        this.parentWindow = parentWindow;
+        setTitle("Installing addon...");
+        jpb.setIndeterminate(true);
+        label = new TextLabel("Installing: " + info.getTitle());
+        getOkButton().addActionListener(this);
+        getCancelButton().addActionListener(this);
+        setLayout(new MigLayout("fill, wrap 1"));
+        add(label);
+        add(jpb, "grow");
+        add(getOkButton(), "split, right");
+        getOkButton().setEnabled(false);
+        setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+        setIconImages(parentWindow.getIconImages());
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param ae Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent ae) {
+        dispose();
+    }
+
+    /**
+     * Tells the window the installation has finished and displays the
+     * appropriate message to the user.
+     *
+     * @param message Message to display (or an empty sting for success)
+     */
+    public void finished(final String message) {
+        if (message.isEmpty()) {
+            label.setText("Finished installing addon: " + info.getTitle());
+        } else {
+            label.setText("Error installing addon: " + info.getTitle() + "<br>"
+                    + message);
+        }
+        jpb.setIndeterminate(false);
+        jpb.setValue(100);
+        getOkButton().setEnabled(true);
+        pack();
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -67,6 +67,7 @@ public class StandardDialog extends JDialog {
         if (owner != null) {
             setIconImages(owner.getIconImages());
         }
+        orderButtons(new JButton(), new JButton());
     }
 
     /**
@@ -81,6 +82,7 @@ public class StandardDialog extends JDialog {
         if (owner != null) {
             setIconImages(owner.getIconImages());
         }
+        orderButtons(new JButton(), new JButton());
     }
 
     /**
@@ -95,6 +97,7 @@ public class StandardDialog extends JDialog {
         if (owner != null) {
             setIconImages(owner.getIconImages());
         }
+        orderButtons(new JButton(), new JButton());
     }
 
     /**