Inject some more dialogs

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

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

@@ -34,6 +34,7 @@ import com.dmdirc.updater.manager.UpdateManagerStatus;
 import java.awt.event.MouseEvent;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 
@@ -54,6 +55,10 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     private final SwingController controller;
     /** The update manager to use to retrieve information. */
     private final CachingUpdateManager updateManager;
+    /** Provider of updater dialogs. */
+    private final Provider<SwingUpdaterDialog> updaterDialogProvider;
+    /** Provider of restart dialogs. */
+    private final Provider<SwingRestartDialog> restartDialogProvider;
 
     /**
      * Instantiates a new updater label, handles showing updates on the status
@@ -61,15 +66,21 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
      *
      * @param controller Swing controller
      * @param updateManager The manager to use to retrieve information.
+     * @param updaterDialogProvider Provider of updater dialogs.
+     * @param restartDialogProvider Provider of restart dialogs.
      */
     @Inject
     public UpdaterLabel(
             final SwingController controller,
-            final CachingUpdateManager updateManager) {
+            final CachingUpdateManager updateManager,
+            final Provider<SwingUpdaterDialog> updaterDialogProvider,
+            final Provider<SwingRestartDialog> restartDialogProvider) {
         super(new JLabel());
 
         this.controller = controller;
         this.updateManager = updateManager;
+        this.updaterDialogProvider = updaterDialogProvider;
+        this.restartDialogProvider = restartDialogProvider;
         setBorder(BorderFactory.createEtchedBorder());
         updateManager.addUpdateManagerListener(this);
         setVisible(false);
@@ -87,9 +98,9 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
             if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 closeDialog();
-                controller.showDialog(SwingRestartDialog.class);
+                restartDialogProvider.get().displayOrRequestFocus();
             } else {
-                controller.showDialog(SwingUpdaterDialog.class, updateManager);
+                updaterDialogProvider.get().displayOrRequestFocus();
             }
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingRestartDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
@@ -33,6 +34,7 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
 import javax.swing.JButton;
 
 import net.miginfocom.swing.MigLayout;
@@ -58,7 +60,10 @@ public class SwingRestartDialog extends StandardDialog implements ActionListener
      * @param parentWindow Parent window
      * @param lifecycleController Life cycle controller, for restarting client
      */
-    public SwingRestartDialog(final DialogManager dialogManager, final Window parentWindow,
+    @Inject
+    public SwingRestartDialog(
+            final DialogManager dialogManager,
+            final MainFrame parentWindow,
             final LifecycleController lifecycleController) {
         this(dialogManager, parentWindow, lifecycleController, "finish updating");
     }

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
@@ -44,6 +45,8 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -76,6 +79,8 @@ public class SwingUpdaterDialog extends StandardDialog implements
     private UpdateComponentTableCellRenderer updateComponentRenderer;
     /** Update.Status renderer. */
     private UpdateStatusTableCellRenderer updateStatusRenderer;
+    /** Provider of restart dialogs. */
+    private final Provider<SwingRestartDialog> restartDialogProvider;
 
     /**
      * Creates a new instance of the updater dialog.
@@ -83,13 +88,19 @@ public class SwingUpdaterDialog extends StandardDialog implements
      * @param updateManager The update manager to use for information
      * @param dialogManager Dialog manager
      * @param parentWindow Parent window
+     * @param restartDialogProvider Provider of restart dialogs.
      */
-    public SwingUpdaterDialog(final CachingUpdateManager updateManager,
-            final DialogManager dialogManager, final Window parentWindow) {
+    @Inject
+    public SwingUpdaterDialog(
+            final CachingUpdateManager updateManager,
+            final DialogManager dialogManager,
+            final MainFrame parentWindow,
+            final Provider<SwingRestartDialog> restartDialogProvider) {
         super(dialogManager, parentWindow, ModalityType.MODELESS);
 
         this.dialogManager = dialogManager;
         this.updateManager = updateManager;
+        this.restartDialogProvider = restartDialogProvider;
 
         initComponents();
         layoutComponents();
@@ -199,7 +210,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
             }.executeInExecutor();
 
             if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
-                dialogManager.showDialog(SwingRestartDialog.class);
+                restartDialogProvider.get().displayOrRequestFocus();
                 dispose();
             }
         } else if (e.getSource().equals(getCancelButton())) {
@@ -227,7 +238,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
                 if (status == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                     if (isVisible()) {
-                        dialogManager.showDialog(SwingRestartDialog.class);
+                        restartDialogProvider.get().displayOrRequestFocus();
                     }
                     dispose();
                 } else {