Move serverlist dialog to server list plugin.

Fixes-Issue: CLIENT-238
Change-Id: I4333c2a982b0c6757b4a450441903316500e4065
Reviewed-on: http://gerrit.dmdirc.com/2245
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddEntryInputDialog.java → src/com/dmdirc/addons/serverlistdialog/AddEntryInputDialog.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
@@ -30,10 +30,9 @@ import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.URIValidator;
 import com.dmdirc.util.validators.Validator;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.ui_swing.SwingController;
 
-import com.dmdirc.ui.IconManager;
 import java.awt.Window;
-import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
@@ -54,11 +53,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class AddEntryInputDialog extends StandardDialog {
 
-    /**
-     * 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Entry name Validator. */
     private final Validator<String> entryValidator;
@@ -76,23 +71,23 @@ public class AddEntryInputDialog extends StandardDialog {
     private final JTree items;
     /** Parent model. */
     private final ServerListModel model;
-    /** Icon manager. */
-    private final IconManager iconManager;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param iconManager Icon manager
+     * @param controller Swing controller
      * @param items Parent tree
      * @param owner Dialog owner
      * @param model Server list model
      */
-    public AddEntryInputDialog(final IconManager iconManager,
+    public AddEntryInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
         super(owner, ModalityType.MODELESS);
 
-        this.iconManager = iconManager;
+        this.controller = controller;
         this.items = items;
         this.model = model;
         this.entryValidator = new NotEmptyValidator();
@@ -128,8 +123,8 @@ public class AddEntryInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        entryName = new ValidatingJTextField(iconManager, entryValidator);
-        uri = new ValidatingJTextField(iconManager, new URIJTextField(), uriValidator);
+        entryName = new ValidatingJTextField(controller.getIconManager(), entryValidator);
+        uri = new ValidatingJTextField(controller.getIconManager(), new URIJTextField(), uriValidator);
         blurb = new TextLabel(message);
         validateText();
     }

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddGroupInputDialog.java → src/com/dmdirc/addons/serverlistdialog/AddGroupInputDialog.java

@@ -20,19 +20,18 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.Validator;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
-import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
@@ -53,11 +52,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class AddGroupInputDialog extends StandardDialog {
 
-    /**
-     * 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Validator. */
     private final Validator<String> validator;
@@ -73,23 +68,23 @@ public class AddGroupInputDialog extends StandardDialog {
     private final JTree tree;
     /** Parent model. */
     private final ServerListModel serverListModel;
-    /** Icon manager. */
-    private final IconManager iconManager;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param iconManager Icon manager
+     * @param controller Swing controller
      * @param items Parent tree
      * @param owner Dialog owner
      * @param model Server list model
      */
-    public AddGroupInputDialog(final IconManager iconManager,
+    public AddGroupInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
         super(owner, ModalityType.MODELESS);
 
-        this.iconManager = iconManager;
+        this.controller = controller;
         this.tree = items;
         this.serverListModel = model;
         this.validator = new NotEmptyValidator();
@@ -137,7 +132,7 @@ public class AddGroupInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        groupName = new ValidatingJTextField(iconManager, validator);
+        groupName = new ValidatingJTextField(controller.getIconManager(), validator);
         networkName = new JTextField();
         blurb = new TextLabel(message);
         validateText();

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Help.java → src/com/dmdirc/addons/serverlistdialog/Help.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Info.java → src/com/dmdirc/addons/serverlistdialog/Info.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.serverlists.ServerGroupItem;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Perform.java → src/com/dmdirc/addons/serverlistdialog/Perform.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 import com.dmdirc.addons.serverlists.ServerGroupItem;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Profiles.java → src/com/dmdirc/addons/serverlistdialog/Profiles.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.util.HashMap;
@@ -46,11 +46,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class Profiles extends JPanel implements ServerListListener {
 
-    /**
-     * 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Server list model. */
     private final ServerListModel model;
@@ -59,16 +55,20 @@ public class Profiles extends JPanel implements ServerListListener {
             new HashMap<ServerGroupItem, JComboBox>();
     /** Info label. */
     private final JLabel label;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new profile panel backed by the specified model.
      *
      * @param model Backing server list model
+     * @param controller Swing controller
      */
-    public Profiles(final ServerListModel model) {
+    public Profiles(final ServerListModel model, final SwingController controller) {
         super();
 
         this.model = model;
+        this.controller = controller;
 
         label = new JLabel("Use this profile on this network: ");
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
@@ -109,8 +109,8 @@ public class Profiles extends JPanel implements ServerListListener {
         if (!combos.containsKey(item)) {
             final DefaultComboBoxModel comboModel = new VetoableComboBoxModel();
 
-            final List<Identity> profiles = IdentityManager.getCustomIdentities(
-                    "profile");
+            final List<Identity> profiles = controller.getIdentityManager()
+                    .getIdentitiesByType("profile");
             Identity selectedItem = null;
             comboModel.addElement(null);
             for (Identity profile : profiles) {

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListDialog.java → src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -20,15 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.addons.ui_swing.components.LockedLayer;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.LockedLayer;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.core.util.URLHandler;
 
-import java.awt.Window;
 import java.awt.color.ColorSpace;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -47,18 +46,12 @@ import org.jdesktop.jxlayer.plaf.effect.BufferedImageOpEffect;
 public final class ServerListDialog extends StandardDialog implements
         ActionListener, ServerListListener {
 
-    /**
-     * 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Server list model. */
     private final ServerListModel model;
     /** Connect button. */
     private final JButton connectButton;
-    /** Previously created instance of dialog. */
-    private static ServerListDialog me = null;
     /** Info lock. */
     private final LockedLayer<Info> infoLock;
     /** Perform lock. */
@@ -78,54 +71,16 @@ public final class ServerListDialog extends StandardDialog implements
     /** Help panel. */
     private final Help help;
 
-    /**
-     * Creates the dialog if one doesn't exist, and displays it.
-     *
-     * @param controller Swing Controller
-     * @param parentWindow Parent window
-     * @param urlHandler The URL Handler to use to handle clicked links
-     */
-    public static void showServerListDialog(final SwingController controller,
-            final Window parentWindow, final URLHandler urlHandler) {
-        me = getServerListDialog(controller, parentWindow, urlHandler);
-
-        me.display();
-        me.requestFocusInWindow();
-    }
-
-    /**
-     * Returns the current instance of the ServerListDialog.
-     *
-     * @param controller Swing Controller
-     * @param parentWindow Parent window
-     * @param urlHandler The URL Handler to use to handle clicked links
-     *
-     * @return The current ServerListDialog instance
-     */
-    public static ServerListDialog getServerListDialog(
-            final SwingController controller, final Window parentWindow,
-            final URLHandler urlHandler) {
-        synchronized (ServerListDialog.class) {
-            if (me == null) {
-                me = new ServerListDialog(controller, parentWindow,
-                ModalityType.MODELESS, urlHandler);
-            }
-        }
-
-        return me;
-    }
-
     /**
      * Creates a new server list dialog.
      *
-     * @param window Parent window
+     * @param controller Swing controller
      * @param modalityType Desired modality
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    private ServerListDialog(final SwingController controller,
-            final Window window, final ModalityType modalityType,
+    public ServerListDialog(final SwingController controller,
             final URLHandler urlHandler) {
-        super(window, modalityType);
+        super(controller.getMainFrame(), ModalityType.MODELESS);
 
         setTitle("Server List");
         model = new ServerListModel();
@@ -145,7 +100,8 @@ public final class ServerListDialog extends StandardDialog implements
         infoLock = new LockedLayer<Info>(new BufferedImageOpEffect(
                 new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
                 null)));
-        profileLayer = new JXLayer<Profiles>(new Profiles(model), profileLock);
+        profileLayer = new JXLayer<Profiles>(new Profiles(model, controller),
+                profileLock);
         performLayer = new JXLayer<Perform>(new Perform(model), performLock);
         settingsLayer = new JXLayer<Settings>(new Settings(controller, model),
                 settingsLock);
@@ -155,7 +111,7 @@ public final class ServerListDialog extends StandardDialog implements
 
         setLayout(new MigLayout("fill, wrap 2, wmin 600, wmax 600"));
 
-        add(new Tree(controller.getIconManager(), model, this),
+        add(new Tree(controller, model, this),
                 "grow, spany 4, wmax 150, wmin 150");
         add(help, "pos 160 0.5al");
         add(infoLayer, "growx, pushx");
@@ -198,18 +154,6 @@ public final class ServerListDialog extends StandardDialog implements
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        synchronized (ServerListDialog.class) {
-            if (me == null) {
-                return;
-            }
-            super.dispose();
-            me = null;
-        }
-    }
-
     /**
      * Lock or unlock layers.
      */

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2006-2011 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.SwingController;
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
+import com.dmdirc.plugins.PluginManager;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+
+/**
+ * Server list dialog plugin.
+ */
+public class ServerListDialogPlugin implements ActionListener {
+
+    /** Swing controller. */
+    private final SwingController controller;
+
+    /**
+     * Creates a new server list dialog plugin.
+     */
+    public ServerListDialogPlugin(final PluginManager pluginManager) {
+        controller = (SwingController) pluginManager.getPluginInfoByName(
+                "ui_swing").getPlugin();
+        final JMenuItem item = new JMenuItem("Server lists");
+        item.setMnemonic('l');
+        item.addActionListener(this);
+        ((MenuBar) controller.getMainFrame().getJMenuBar()).addMenuItem(
+                "Server", item);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        new ServerListDialog(controller, controller.getURLHandler()).display();
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListListener.java → src/com/dmdirc/addons/serverlistdialog/ServerListListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListModel.java → src/com/dmdirc/addons/serverlistdialog/ServerListModel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.actions.wrappers.PerformType;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Settings.java → src/com/dmdirc/addons/serverlistdialog/Settings.java

@@ -20,10 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -47,11 +46,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class Settings extends JPanel implements ServerListListener {
 
-    /**
-     * 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Server list model. */
     private final ServerListModel model;
@@ -119,7 +114,7 @@ public class Settings extends JPanel implements ServerListListener {
                 panels.put(item, new SettingsPanel(controller, "", false));
                 addSettings(panels.get(item), new ConfigManager("irc", "",
                     item.getGroup().getNetwork(), item.getName()),
-                    IdentityManager.getServerConfig(item.getName()));
+                    controller.getIdentityManager().createServerConfig(item.getName()));
             } else if (item == null) {
                 panels.put(null, new SettingsPanel(controller, "", false));
             } else {

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Tree.java → src/com/dmdirc/addons/serverlistdialog/Tree.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.renderers.ServerGroupTreeRenderer;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Rectangle;
 import java.awt.Window;
@@ -52,11 +52,7 @@ import net.miginfocom.swing.MigLayout;
 public class Tree extends JPanel implements TreeSelectionListener,
         ServerListListener, 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).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Tree. */
     private final JTree items;
@@ -70,21 +66,21 @@ public class Tree extends JPanel implements TreeSelectionListener,
     private final JButton addItemButton;
     /** Parent window. */
     private final Window parentWindow;
-    /** Icon manager. */
-    private final IconManager iconManager;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new tree of server groups.
      *
-     * @param iconManager Icon Manager
+     * @param controller Swing controller
      * @param model Model backing this tree
      * @param parentWindow Dialog's parent window
      */
-    public Tree(final IconManager iconManager, final ServerListModel model,
+    public Tree(final SwingController controller, final ServerListModel model,
             final Window parentWindow) {
         super();
 
-        this.iconManager = iconManager;
+        this.controller = controller;
         this.model = model;
         this.parentWindow = parentWindow;
         addGroupButton = new JButton("Add group");
@@ -93,12 +89,7 @@ public class Tree extends JPanel implements TreeSelectionListener,
         treeModel = model.getTreeModel();
         items = new JTree(treeModel) {
 
-            /**
-             * 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).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 2;
 
             /** {@inheritDoc} */
@@ -145,7 +136,11 @@ public class Tree extends JPanel implements TreeSelectionListener,
         addItemButton.addActionListener(this);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Tree selection event
+     */
     @Override
     public final void valueChanged(final TreeSelectionEvent e) {
         if (items.getSelectionPath() == null) {
@@ -199,9 +194,9 @@ public class Tree extends JPanel implements TreeSelectionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addGroupButton) {
-            new AddGroupInputDialog(iconManager, parentWindow, items, model).display();
+            new AddGroupInputDialog(controller, parentWindow, items, model).display();
         } else {
-            new AddEntryInputDialog(iconManager, parentWindow, items, model).display();
+            new AddEntryInputDialog(controller, parentWindow, items, model).display();
         }
     }
 
@@ -216,7 +211,7 @@ public class Tree extends JPanel implements TreeSelectionListener,
     private DefaultMutableTreeNode getNodeForGroup(final ServerGroupItem item) {
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) items.getModel()
                 .getRoot();
-        final Enumeration enumeration = ((DefaultMutableTreeNode) items
+        final Enumeration<?> enumeration = ((DefaultMutableTreeNode) items
                 .getModel().getRoot()).breadthFirstEnumeration();
         while (enumeration.hasMoreElements()) {
             final DefaultMutableTreeNode current =

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/URIJTextField.java → src/com/dmdirc/addons/serverlistdialog/URIJTextField.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.addons.ui_swing.dialogs.serverlist;
+package com.dmdirc.addons.serverlistdialog;
 
 import javax.swing.JTextField;
 

src/com/dmdirc/addons/serverlistdialog/plugin.config

@@ -0,0 +1,29 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+  requires
+
+metadata:
+  author=Greg <greg@dmdirc.com>
+  mainclass=com.dmdirc.addons.serverlistdialog.ServerListDialogPlugin
+  description=Support for server lists
+  name=serverlistdialog
+  nicename=Server List Dialog
+
+updates:
+  id=59
+
+version:
+  friendly=0.1
+
+requires:
+  parent=ui_swing
+
+persistent:
+  *

src/com/dmdirc/addons/serverlists/plugin.config

@@ -7,6 +7,7 @@ keysections:
   metadata
   updates
   version
+  requires
 
 metadata:
   author=Chris <chris@dmdirc.com>

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

@@ -29,9 +29,6 @@ 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.NewServerDialog;
-import com.dmdirc.addons.ui_swing.dialogs.serverlist.ServerListDialog;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -41,9 +38,12 @@ import javax.swing.JMenuItem;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 
+import lombok.AutoGenMethodStub;
+
 /**
  * A menu providing server related commands to the menu bar.
  */
+@AutoGenMethodStub
 public class ServerMenu extends JMenu implements ActionListener,
         MenuListener {
 
@@ -58,7 +58,7 @@ public class ServerMenu extends JMenu implements ActionListener,
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items which can be enabled/disabled. */
-    private JMenuItem ssd, disconnect, serverlist;
+    private JMenuItem ssd, disconnect;
 
     /**
      * Creates a new Server menu.
@@ -81,12 +81,6 @@ public class ServerMenu extends JMenu implements ActionListener,
      * Initialises the server menu.
      */
     private void initServerMenu() {
-        serverlist = new JMenuItem();
-        serverlist.setText("Server lists");
-        serverlist.setMnemonic('l');
-        serverlist.setActionCommand("ServerList");
-        serverlist.addActionListener(this);
-
         JMenuItem menuItem = new JMenuItem();
         menuItem.setText("New Server...");
         menuItem.setMnemonic('n');
@@ -123,9 +117,6 @@ public class ServerMenu extends JMenu implements ActionListener,
     public void actionPerformed(final ActionEvent e) {
         if ("NewServer".equals(e.getActionCommand())) {
             NewServerDialog.showNewServerDialog(controller);
-        } else if (e.getActionCommand().equals("ServerList")) {
-            ServerListDialog.showServerListDialog(controller, mainFrame,
-                    controller.getURLHandler());
         } else if (e.getActionCommand().equals("Exit")) {
             mainFrame.quit();
         } else if (e.getActionCommand().equals("ServerSettings")) {
@@ -150,29 +141,5 @@ public class ServerMenu extends JMenu implements ActionListener,
         disconnect.setEnabled(activeWindow != null && activeWindow
                 .getServer() != null && activeWindow.getServer().getState()
                 == ServerState.CONNECTED);
-
-        final PluginInfo plugin = PluginManager.getPluginManager()
-                .getPluginInfoByName("serverlists");
-        if (plugin != null) {
-            if (!plugin.isLoaded()) {
-                plugin.loadPlugin();
-            }
-
-            if (getMenuComponent(0) != serverlist) {
-                add(serverlist, 0);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final void menuDeselected(final MenuEvent e) {
-        //Ignore
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final void menuCanceled(final MenuEvent e) {
-        //Ignore
     }
 }