Add dialog provider for Channel List Dialog.

Change-Id: I6d9576d01be09a16727b2f0e69391d90d60279e6
Reviewed-on: http://gerrit.dmdirc.com/3270
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -26,11 +26,11 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.ChannelJoinDialogFactory;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 
 import java.awt.event.ActionEvent;
@@ -54,10 +54,10 @@ public class ChannelMenu extends JMenu implements ActionListener,
     private static final long serialVersionUID = 1;
     /** Dialog provider. */
     private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
+    /** Channel list dialog provider. */
+    private final DialogProvider<ChannelListDialog> channelListDialogProvider;
     /** Channel join dialog factory. */
     private final ChannelJoinDialogFactory channelJoinDialogFactory;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items to be disabled/enabled. */
@@ -68,22 +68,22 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /**
      * Creates a new channel menu.
      *
-     * @param controller               Parent swing controller.
-     * @param mainFrame                Parent mainframe
-     * @param dialogProvider           Channel settings dialog provider
-     * @param channelJoinDialogFactory Channel join dialog factory
+     * @param mainFrame                 Parent mainframe
+     * @param dialogProvider            Channel settings dialog provider
+     * @param channelJoinDialogFactory  Channel join dialog factory
+     * @param channelListDialogProvider Channel list dialog provider
      */
     @Inject
     public ChannelMenu(
-            final SwingController controller,
             final MainFrame mainFrame,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
-            final ChannelJoinDialogFactory channelJoinDialogFactory) {
+            final ChannelJoinDialogFactory channelJoinDialogFactory,
+            final DialogProvider<ChannelListDialog> channelListDialogProvider) {
         super("Channel");
-        this.controller = controller;
         this.mainFrame = mainFrame;
         this.dialogProvider = dialogProvider;
         this.channelJoinDialogFactory = channelJoinDialogFactory;
+        this.channelListDialogProvider = channelListDialogProvider;
         setMnemonic('c');
         addMenuListener(this);
         initChannelMenu();
@@ -130,7 +130,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
                 }
                 break;
             case "ListChannels":
-                new ChannelListDialog(controller).display();
+                channelListDialogProvider.displayOrRequestFocus();
                 break;
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -23,12 +23,13 @@
 package com.dmdirc.addons.ui_swing.dialogs.channellist;
 
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
 import javax.swing.JLabel;
 
 import net.miginfocom.swing.MigLayout;
@@ -36,22 +37,22 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Provides a UI to search for channels in DMDirc.
  */
-public class ChannelListDialog extends StandardDialog implements
-        ActionListener {
+public class ChannelListDialog extends StandardDialog implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1L;
     /** List panel. */
-    private ChannelListPanel list;
+    private final ChannelListPanel list;
     /** Size label. */
-    private JLabel total;
+    private final JLabel total;
 
-    public ChannelListDialog(final SwingController controller) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
+    @Inject
+    public ChannelListDialog(final MainFrame mainFrame) {
+        super(mainFrame, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
-        list = new ChannelListPanel((Server) controller.getMainFrame().getActiveFrame()
-                .getContainer().getConnection(), total);
+        list = new ChannelListPanel((Server) mainFrame.getActiveFrame().getContainer()
+                .getConnection(), total);
         layoutComponents();
         getCancelButton().setText("Close");
         getCancelButton().addActionListener(this);
@@ -65,11 +66,6 @@ public class ChannelListDialog extends StandardDialog implements
         add(getCancelButton(), "right");
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
     @Override
     public void actionPerformed(final ActionEvent e) {
         dispose();

src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -36,6 +36,7 @@ import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
@@ -205,4 +206,11 @@ public class DialogModule {
         return new SwingRestartDialog(mainFrame, lifecycleController, "apply settings");
     }
 
+    @Provides
+    @Singleton
+    public DialogProvider<ChannelListDialog> getChannelListDialogProvider(
+            final Provider<ChannelListDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
 }