Use DI in the server list dialog plugin.

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

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -227,11 +227,11 @@ public final class LagDisplayPlugin extends BasePlugin implements
         } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
             ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
         } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
-                && ((Integer) arguments[1]).intValue() == 421
+                && ((Integer) arguments[1]) == 421
                 && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
             try {
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
-                final Long duration = Long.valueOf(new Date().getTime() - sent);
+                final Long duration = new Date().getTime() - sent;
                 final String value = formatTime(duration);
 
                 pings.put((Connection) arguments[0], value);

src/com/dmdirc/addons/serverlistdialog/ServerListController.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.serverlistdialog;
+
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.swing.JMenuItem;
+
+/**
+ * Handles registering of the server list menu items, and creation of the server list dialog.
+ */
+public class ServerListController {
+
+    private final Provider<ServerListDialog> dialogProvider;
+    private final MenuBar menuBar;
+
+    @Inject
+    public ServerListController(
+            final Provider<ServerListDialog> dialogProvider,
+            final MenuBar menuBar) {
+        this.dialogProvider = dialogProvider;
+        this.menuBar = menuBar;
+    }
+
+    /**
+     * Adds the 'Server lists' menu item to the app's main menu.
+     */
+    public void addMenu() {
+        final JMenuItem item = new JMenuItem("Server lists");
+        item.setMnemonic('l');
+        item.addActionListener(new MenuActionListener());
+        menuBar.addMenuItem("Server", item);
+    }
+
+    /**
+     * Removes the 'Server lists' menu item from the app's main menu.
+     */
+    public void removeMenu() {
+        // TODO: Add ability to remove items to MenuBar, remove the server list item when unloaded.
+    }
+
+    /**
+     * Listener that gets and displays a server list dialog when an action is performed.
+     */
+    private class MenuActionListener implements ActionListener {
+
+        @Override
+        public void actionPerformed(final ActionEvent e) {
+            dialogProvider.get().display();
+        }
+
+    }
+
+}

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -22,10 +22,13 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LockedLayer;
+import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.core.util.URLHandler;
 
@@ -34,6 +37,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.ColorConvertOp;
 
+import javax.inject.Inject;
 import javax.swing.JButton;
 
 import net.miginfocom.swing.MigLayout;
@@ -78,17 +82,22 @@ public class ServerListDialog extends StandardDialog implements
      * @param controller Swing controller
      * @param urlHandler The URL Handler to use to handle clicked links
      * @param performWrapper The wrapper to use for the perform tab
+     * @param serverListModel The model to use for the dialog.
+     * @param dialogManager The manager to register the dialog with.
+     * @param mainFrame The main frame that owns the dialog.
      */
+    @Inject
     public ServerListDialog(
             final SwingController controller,
             final URLHandler urlHandler,
-            final PerformWrapper performWrapper) {
-        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
+            final PerformWrapper performWrapper,
+            final ServerListModel serverListModel,
+            final DialogManager dialogManager,
+            final MainFrame mainFrame) {
+        super(dialogManager, mainFrame, ModalityType.MODELESS);
 
         setTitle("Server List");
-        model = new ServerListModel(controller.getPluginManager(),
-                controller.getServerManager(), controller.getIdentityManager(),
-                controller.getIdentityFactory());
+        model = serverListModel;
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
         connectButton = new JButton("Connect");

src/com/dmdirc/addons/serverlistdialog/ServerListDialogPlugin.java

@@ -22,51 +22,34 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JMenuItem;
+import dagger.ObjectGraph;
 
 /**
  * Server list dialog plugin.
  */
-public class ServerListDialogPlugin extends BasePlugin implements ActionListener {
-
-    /** Swing controller. */
-    private final SwingController controller;
+public class ServerListDialogPlugin extends BasePlugin {
 
-    /** The wrapper to use for modifying performs. */
-    private final PerformWrapper performWrapper;
+    /** Controller that manages the server list. */
+    private ServerListController controller;
 
-    /**
-     * Creates a new server list dialog plugin.
-     *
-     * @param swingController The controller that will own the dialog.
-     * @param performWrapper The wrapper to use for modifying performs.
-     */
-    public ServerListDialogPlugin(
-            final SwingController swingController,
-            final PerformWrapper performWrapper) {
-        this.performWrapper = performWrapper;
+    @Override
+    public void onUnload() {
+        super.onUnload();
 
-        controller = swingController;
-        final JMenuItem item = new JMenuItem("Server lists");
-        item.setMnemonic('l');
-        item.addActionListener(this);
-        controller.getMainFrame().getJMenuBar().addMenuItem("Server", item);
+        controller.removeMenu();
+        controller = null;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
     @Override
-    public void actionPerformed(final ActionEvent e) {
-        new ServerListDialog(controller, controller.getUrlHandler(), performWrapper).display();
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new ServerListModule()));
+
+        controller = getObjectGraph().get(ServerListController.class);
+        controller.addMenu();
     }
+
 }

src/com/dmdirc/addons/serverlistdialog/ServerListModel.java

@@ -32,14 +32,13 @@ import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.serverlists.ServerList;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
@@ -62,19 +61,18 @@ public class ServerListModel {
     /**
      * Creates a new server list model.
      *
-     * @param pluginManager PluginManager currently in use.
      * @param serverManager ServerManager currently in use.
      * @param identityController The controller to read/write settings with.
-     * @param identityFactory The factory to create identities with.
+     * @param serverList The server list to use for the top-level entries.
      */
+    @Inject
     public ServerListModel(
-            final PluginManager pluginManager,
             final ServerManager serverManager,
             final IdentityController identityController,
-            final IdentityFactory identityFactory) {
+            final ServerList serverList) {
         this.serverManager = serverManager;
         this.identityController = identityController;
-        list = new ServerList(pluginManager, serverManager, identityController, identityFactory);
+        list = serverList;
         listeners = new ListenerList();
     }
 

src/com/dmdirc/addons/serverlistdialog/ServerListModule.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.serverlistdialog;
+
+import com.dmdirc.addons.ui_swing.SwingModule;
+
+import dagger.Module;
+
+/**
+ * DI module for the server list plugin.
+ */
+@Module(injects = {ServerListController.class}, addsTo = SwingModule.class)
+public class ServerListModule {
+
+}

src/com/dmdirc/addons/serverlists/ServerList.java

@@ -39,6 +39,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /**
  * Maintains a list of top level {@link ServerGroup}s and handles reading and
  * writing of the lists to disk.
@@ -67,6 +69,7 @@ public class ServerList implements ConfigProviderListener {
      * @param identityController The controller to read/write settings with.
      * @param identityFactory The factory to create new identities with.
      */
+    @Inject
     public ServerList(
             final PluginManager pluginManager,
             final ServerManager serverManager,