Overhaul and tidy Manu bar code.

Fixes issue CLIENT-96

Change-Id: Ibc98def05f395e6ffee6f5cb3159cf1c9a599664
Reviewed-on: http://gerrit.dmdirc.com/1589
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -26,12 +26,13 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.addons.ui_swing.components.MenuBar;
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import java.awt.Toolkit;
 
 import java.awt.event.ActionEvent;
 import java.lang.reflect.Field;
@@ -42,6 +43,7 @@ import java.lang.reflect.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -108,7 +110,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     /** Has the CLIENT_OPENED action been called? */
     private volatile boolean clientOpened = false;
     /** Store any addresses that are opened before CLIENT_OPENED. */
-    private final ArrayList<URI> addresses = new ArrayList<URI>();
+    private final List<URI> addresses = new ArrayList<URI>();
 
     /**
      * Get the "Apple" instance.
@@ -146,7 +148,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * Get the "Application" object
+     * Get the "Application" object.
      *
      * @return Object that on OSX will be an "Application"
      */
@@ -157,19 +159,25 @@ public final class Apple implements InvocationHandler, ActionListener {
                 final Method method = app.getMethod("getApplication",
                         new Class[0]);
                 application = method.invoke(null, new Object[0]);
-            } catch (ClassNotFoundException ex) { // Probably not on OS X, do nothing.
-            } catch (NoSuchMethodException ex) { // Probably not on OS X, do nothing.
-            } catch (SecurityException ex) { // Probably not on OS X, do nothing.
-            } catch (IllegalAccessException ex) { // Probably not on OS X, do nothing.
-            } catch (IllegalArgumentException ex) { // Probably not on OS X, do nothing.
-            } catch (InvocationTargetException ex) { // Probably not on OS X, do nothing.
+            } catch (ClassNotFoundException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (NoSuchMethodException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (SecurityException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (IllegalAccessException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (IllegalArgumentException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (InvocationTargetException ex) {
+                // Probably not on OS X, do nothing.
             }
         }
         return application;
     }
 
     /**
-     * Get the "NSApplication" object
+     * Get the "NSApplication" object.
      *
      * @return Object that on OSX will be an "NSApplication"
      */
@@ -181,10 +189,14 @@ public final class Apple implements InvocationHandler, ActionListener {
                 final Method method = app.getMethod("sharedApplication",
                         new Class[0]);
                 nsApplication = method.invoke(null, new Object[0]);
-            } catch (ClassNotFoundException ex) { // Probably not on OS X, do nothing.
-            } catch (NoSuchMethodException ex) { // Probably not on OS X, do nothing.
-            } catch (IllegalAccessException ex) { // Probably not on OS X, do nothing.
-            } catch (InvocationTargetException ex) { // Probably not on OS X, do nothing.
+            } catch (ClassNotFoundException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (NoSuchMethodException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (IllegalAccessException ex) {
+                // Probably not on OS X, do nothing.
+            } catch (InvocationTargetException ex) {
+                // Probably not on OS X, do nothing.
             }
         }
         return nsApplication;
@@ -227,7 +239,8 @@ public final class Apple implements InvocationHandler, ActionListener {
         System.setProperty("com.apple.mrj.application.apple.menu.about.name",
                 "DMDirc");
         System.setProperty("apple.laf.useScreenMenuBar", "true");
-        System.setProperty("com.apple.mrj.application.growbox.intrudes", "false");
+        System.setProperty("com.apple.mrj.application.growbox.intrudes",
+                "false");
         System.setProperty("com.apple.mrj.application.live-resize", "true");
     }
 
@@ -249,15 +262,19 @@ public final class Apple implements InvocationHandler, ActionListener {
             final Method method = getNSApplication().getClass().getMethod(
                     "requestUserAttention", new Class[]{Integer.TYPE});
             method.invoke(getNSApplication(), new Object[]{type.get(null)});
-        } catch (NoSuchFieldException ex) { // Probably not on OS X, do nothing.
-        } catch (NoSuchMethodException ex) { // Probably not on OS X, do nothing.
-        } catch (IllegalAccessException ex) { // Probably not on OS X, do nothing.
-        } catch (InvocationTargetException ex) { // Probably not on OS X, do nothing.
+        } catch (NoSuchFieldException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (NoSuchMethodException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (IllegalAccessException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (InvocationTargetException ex) {
+            // Probably not on OS X, do nothing.
         }
     }
 
     /**
-     * Set this up as a listener for the Apple Events
+     * Set this up as a listener for the Apple Events.
      *
      * @return True if the listener was added, else false.
      */
@@ -287,10 +304,14 @@ public final class Apple implements InvocationHandler, ActionListener {
                     new Class[]{Boolean.TYPE});
             method.invoke(getApplication(), new Object[]{Boolean.TRUE});
             return true;
-        } catch (ClassNotFoundException ex) { // Probably not on OS X, do nothing.
-        } catch (NoSuchMethodException ex) { // Probably not on OS X, do nothing.
-        } catch (IllegalAccessException ex) { // Probably not on OS X, do nothing.
-        } catch (InvocationTargetException ex) { // Probably not on OS X, do nothing.
+        } catch (ClassNotFoundException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (NoSuchMethodException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (IllegalAccessException ex) {
+            // Probably not on OS X, do nothing.
+        } catch (InvocationTargetException ex) {
+            // Probably not on OS X, do nothing.
         }
         return false;
     }
@@ -320,8 +341,8 @@ public final class Apple implements InvocationHandler, ActionListener {
                             getParameterTypes()).invoke(args[0], a);
                 }
             });
-            Method thisMethod = this.getClass().getMethod(method.getName(),
-                    new Class[]{ApplicationEvent.class});
+            final Method thisMethod = this.getClass().getMethod(
+                    method.getName(), new Class[]{ApplicationEvent.class});
             return thisMethod.invoke(this, event);
         } catch (NoSuchMethodException e) {
             if (method.getName().equals("equals") && args.length == 1) {
@@ -357,7 +378,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * Handle an event using the menuBar
+     * Handle an event using the menuBar.
      *
      * @param name The name of the event according to the menubar
      * @param event The ApplicationEvent we are handingle
@@ -367,15 +388,16 @@ public final class Apple implements InvocationHandler, ActionListener {
         if (!isApple() || menuBar == null) {
             return;
         }
+        event.setHandled(true);
         final ActionEvent actionEvent = new ActionEvent(this,
                 ActionEvent.ACTION_PERFORMED, name);
 
-        menuBar.actionPerformed(actionEvent);
-        event.setHandled(true);
+        Toolkit.getDefaultToolkit().getSystemEventQueue()
+                .postEvent(actionEvent);
     }
 
     /**
-     * This is called when Quit is selected from the Application menu
+     * This is called when Quit is selected from the Application menu.
      *
      * @param event an ApplicationEvent object
      */
@@ -384,7 +406,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when About is selected from the Application menu
+     * This is called when About is selected from the Application menu.
      *
      * @param event an ApplicationEvent object
      */
@@ -393,7 +415,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when Preferences is selected from the Application menu
+     * This is called when Preferences is selected from the Application menu.
      *
      * @param event an ApplicationEvent object
      */
@@ -402,7 +424,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when the Application is opened
+     * This is called when the Application is opened.
      *
      * @param event an ApplicationEvent object
      */
@@ -410,7 +432,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when the application is asked to open a file
+     * This is called when the application is asked to open a file.
      *
      * @param event an ApplicationEvent object
      */
@@ -418,7 +440,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when asked to print
+     * This is called when asked to print.
      *
      * @param event an ApplicationEvent object
      */
@@ -426,7 +448,7 @@ public final class Apple implements InvocationHandler, ActionListener {
     }
 
     /**
-     * This is called when the application is reopened
+     * This is called when the application is reopened.
      *
      * @param event an ApplicationEvent object
      */
@@ -450,9 +472,9 @@ public final class Apple implements InvocationHandler, ActionListener {
 
     /**
      * Callback from JNI library.
-     * If called before the client has finished opening, the URL will be added to
-     * a list that will be connected to once the CLIENT_OPENED action is called.
-     * Otherwise we connect right away.
+     * If called before the client has finished opening, the URL will be added
+     * to a list that will be connected to once the CLIENT_OPENED action is
+     * called. Otherwise we connect right away.
      *
      * @param url The irc url to connect to.
      */

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -27,7 +27,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.MenuBar;
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;

src/com/dmdirc/addons/ui_swing/components/MenuBar.java

@@ -1,367 +0,0 @@
-/*
- * 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;
-
-import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.ServerManager;
-import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
-import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
-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.prefs.SwingPreferencesDialog;
-import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
-import com.dmdirc.addons.ui_swing.dialogs.serverlist.ServerListDialog;
-import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
-import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.WindowManager;
-
-import java.awt.Dialog.ModalityType;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.Box;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
-import net.miginfocom.layout.PlatformDefaults;
-import net.miginfocom.swing.MigLayout;
-
-/**
- * DMDirc menu bar.
- */
-public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
-
-    /**
-     * 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;
-    /** Menu items which can be enabled/disabled. */
-    private JMenuItem csd, ssd, disconnect, serverlist, join;
-    /** Server menu. */
-    private JMenu serverMenu;
-    /** Swing controller. */
-    private final SwingController controller;
-    /** Main frame. */
-    private final MainFrame mainFrame;
-    /** Normal menu count. */
-    private int menuItemCount = 0;
-
-    /**
-     * Instantiates a new menu bar.
-     *
-     * @param controller Swing controller
-     * @param mainFrame Main frame
-     */
-    public MenuBar(final SwingController controller, 
-            final MainFrame mainFrame) {
-        super();
-        this.controller = controller;
-        this.mainFrame = mainFrame;
-
-        setLayout(new MigLayout("ins 0, fillx"));
-
-        initServerMenu();
-        initChannelMenu();
-        initSettingsMenu();
-        add(new WindowMenuFrameManager(controller));
-        initHelpMenu();
-        menuItemCount = getComponentCount();
-        super.add(Box.createHorizontalGlue(), "growx, pushx");
-        super.add(new MDIBar(controller, mainFrame));
-        super.add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1)
-                .getUnit()));
-        menuItemCount = getComponentCount() - menuItemCount;
-
-        getActionMap().setParent(null);
-        getActionMap().clear();
-        menuSelected(null);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public JMenu add(final JMenu c) {
-        return (JMenu) super.add(c, getComponentCount() - menuItemCount);
-    }
-
-    /**
-     * Initialises the server menu.
-     */
-    private void initServerMenu() {
-        serverMenu = new JMenu("Server");
-        serverMenu.setMnemonic('s');
-        serverMenu.addMenuListener(this);
-        add(serverMenu);
-
-        serverlist = new JMenuItem();
-        serverlist.setText("Server list dialog");
-        serverlist.setMnemonic('l');
-        serverlist.setActionCommand("ServerList");
-        serverlist.addActionListener(this);
-
-        JMenuItem menuItem = new JMenuItem();
-        menuItem.setText("New Server...");
-        menuItem.setMnemonic('n');
-        menuItem.setActionCommand("NewServer");
-        menuItem.addActionListener(this);
-        serverMenu.add(menuItem);
-
-        disconnect = new JMenuItem();
-        disconnect.setText("Disconnect");
-        disconnect.setMnemonic('d');
-        disconnect.setActionCommand("Disconnect");
-        disconnect.addActionListener(this);
-        serverMenu.add(disconnect);
-
-        ssd = new JMenuItem();
-        ssd.setMnemonic('s');
-        ssd.setText("Server settings");
-        ssd.setActionCommand("ServerSettings");
-        ssd.addActionListener(this);
-        serverMenu.add(ssd);
-
-        if (!Apple.isAppleUI()) {
-            menuItem = new JMenuItem();
-            menuItem.setText("Exit");
-            menuItem.setMnemonic('x');
-            menuItem.setActionCommand("Exit");
-            menuItem.addActionListener(this);
-            serverMenu.add(menuItem);
-        }
-    }
-
-    /**
-     * Initialises the channel menu.
-     */
-    private void initChannelMenu() {
-        final JMenu menu = new JMenu("Channel");
-        menu.setMnemonic('c');
-        menu.addMenuListener(this);
-        add(menu);
-
-        join = new JMenuItem();
-        join.setText("Join Channel...");
-        join.setMnemonic('j');
-        join.setActionCommand("JoinChannel");
-        join.addActionListener(this);
-        menu.add(join);
-
-        csd = new JMenuItem();
-        csd.setMnemonic('c');
-        csd.setText("Channel Settings");
-        csd.setActionCommand("ChannelSettings");
-        csd.addActionListener(this);
-        menu.add(csd);
-    }
-
-    /**
-     * Initialises the settings menu.
-     */
-    private void initSettingsMenu() {
-        JMenuItem menuItem;
-        final JMenu menu = new JMenu("Settings");
-        menu.setMnemonic('e');
-        menu.addMenuListener(this);
-        add(menu);
-
-        if (!Apple.isAppleUI()) {
-            menuItem = new JMenuItem();
-            menuItem.setText("Preferences");
-            menuItem.setMnemonic('p');
-            menuItem.setActionCommand("Preferences");
-            menuItem.addActionListener(this);
-            menu.add(menuItem);
-        }
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('m');
-        menuItem.setText("Profile Manager");
-        menuItem.setActionCommand("Profile");
-        menuItem.addActionListener(this);
-        menu.add(menuItem);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('a');
-        menuItem.setText("Actions Manager");
-        menuItem.setActionCommand("Actions");
-        menuItem.addActionListener(this);
-        menu.add(menuItem);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('l');
-        menuItem.setText("Alias Manager");
-        menuItem.setActionCommand("Aliases");
-        menuItem.addActionListener(this);
-        menu.add(menuItem);
-    }
-
-    /**
-     * Initialises the help menu.
-     */
-    private void initHelpMenu() {
-        JMenuItem menuItem;
-        final JMenu menu = new JMenu("Help");
-        menu.setMnemonic('h');
-        add(menu);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('j');
-        menuItem.setText("Join Dev channel");
-        menuItem.setActionCommand("JoinDevChat");
-        menuItem.addActionListener(this);
-        menu.add(menuItem);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('f');
-        menuItem.setText("Send Feedback");
-        menuItem.setActionCommand("feedback");
-        menuItem.addActionListener(this);
-        menu.add(menuItem);
-
-        if (!Apple.isAppleUI()) {
-            menuItem = new JMenuItem();
-            menuItem.setMnemonic('a');
-            menuItem.setText("About");
-            menuItem.setActionCommand("About");
-            menuItem.addActionListener(this);
-            menu.add(menuItem);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if ("ServerList".equals(e.getActionCommand())) {
-            ServerListDialog.showServerListDialog(mainFrame, controller.getURLHandler());
-        } else if ("NewServer".equals(e.getActionCommand())) {
-            NewServerDialog.showNewServerDialog(mainFrame);
-        } else if ("Preferences".equals(e.getActionCommand())) {
-            SwingPreferencesDialog.showSwingPreferencesDialog(controller);
-        } else if (e.getActionCommand().equals("About")) {
-            AboutDialog.showAboutDialog(mainFrame, controller.getURLHandler());
-        } else if (e.getActionCommand().equals("Profile")) {
-            ProfileManagerDialog.showProfileManagerDialog(mainFrame);
-        } else if (e.getActionCommand().equals("Exit")) {
-            mainFrame.quit();
-        } else if (e.getActionCommand().equals("Actions")) {
-            ActionsManagerDialog.showActionsManagerDialog(mainFrame,
-                    controller);
-        } else if (e.getActionCommand().equals("Aliases")) {
-            AliasManagerDialog.showAliasManagerDialog(mainFrame);
-        } else if (e.getActionCommand().equals("JoinDevChat")) {
-            ServerManager.getServerManager().joinDevChat();
-        } else if (e.getActionCommand().equals("feedback")) {
-            FeedbackDialog.showFeedbackDialog(mainFrame);
-        } else if (e.getActionCommand().equals("ChannelSettings")) {
-            final FrameContainer<?> activeWindow = WindowManager
-                    .getActiveWindow();
-            if (activeWindow instanceof Channel) {
-                controller.showChannelSettingsDialog(((Channel) activeWindow));
-            }
-        } else if (e.getActionCommand().equals("ServerSettings")) {
-            controller.showServerSettingsDialog(WindowManager
-                    .getActiveServer());
-        } else if (e.getActionCommand().equals("Disconnect")) {
-            WindowManager.getActiveServer().disconnect();
-        } else if (e.getActionCommand().equals("JoinChannel")) {
-            new StandardInputDialog(mainFrame, ModalityType.MODELESS,
-                    "Join channel", "Enter the name of the channel to join.") {
-
-                /** Serial version UID. */
-                private static final long serialVersionUID = 1;
-
-                /** {@inheritDoc} */
-                @Override
-                public boolean save() {
-                    WindowManager.getActiveServer().join(new ChannelJoinRequest(
-                            getText()));
-                    return true;
-                }
-
-                /** {@inheritDoc} */
-                @Override
-                public void cancelled() {
-                    //Ignore
-                }
-            }.display();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuSelected(final MenuEvent e) {
-        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
-
-        ssd.setEnabled(activeWindow != null && activeWindow.getServer() != null
-                && activeWindow.getServer().getState() == ServerState.CONNECTED);
-        csd.setEnabled(activeWindow instanceof Channel
-                && activeWindow.getServer() != null
-                && activeWindow.getServer().getState() == ServerState.CONNECTED);
-        disconnect.setEnabled(activeWindow != null
-                && activeWindow.getServer() != null
-                && activeWindow.getServer().getState() == ServerState.CONNECTED);
-        join.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 (serverMenu.getMenuComponent(0) != serverlist) {
-                serverMenu.add(serverlist, 0);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuDeselected(final MenuEvent e) {
-        //Ignore
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuCanceled(final MenuEvent e) {
-        //Ignore
-    }
-}

src/com/dmdirc/addons/ui_swing/components/frames/AppleJFrame.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.MenuBar;
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 
 import javax.swing.JFrame;
 

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

@@ -0,0 +1,137 @@
+/*
+ * 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.menubar;
+
+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.dialogs.ChannelJoinDialog;
+import com.dmdirc.ui.WindowManager;
+
+import java.awt.Dialog.ModalityType;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+/**
+ * A menu to provide channel related commands in the menu bar.
+ */
+public class ChannelMenu extends JMenu implements ActionListener,
+        MenuListener {
+
+    /**
+     * 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;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Main frame. */
+    private final MainFrame mainFrame;
+    /** Menu items to be disabled/enabled. */
+    private JMenuItem csd, join;
+
+    /**
+     * Creates a new channel menu.
+     *
+     * @param controller Parent swing controller.
+     * @param mainFrame Parent mainframe
+     */
+    public ChannelMenu(final SwingController controller,
+            final MainFrame mainFrame) {
+        super("Channel");
+        this.controller = controller;
+        this.mainFrame = mainFrame;
+        setMnemonic('c');
+        addMenuListener(this);
+        initChannelMenu();
+        menuSelected(null);
+    }
+
+    /**
+     * Initialises the channel menu.
+     */
+    private void initChannelMenu() {
+        join = new JMenuItem();
+        join.setText("Join Channel...");
+        join.setMnemonic('j');
+        join.setActionCommand("JoinChannel");
+        join.addActionListener(this);
+        add(join);
+
+        csd = new JMenuItem();
+        csd.setMnemonic('c');
+        csd.setText("Channel Settings");
+        csd.setActionCommand("ChannelSettings");
+        csd.addActionListener(this);
+        add(csd);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getActionCommand().equals("JoinChannel")) {
+            new ChannelJoinDialog(mainFrame, ModalityType.MODELESS,
+                    "Join channel", "Enter the name of the channel to join.")
+                    .display();
+        } else if (e.getActionCommand().equals("ChannelSettings")) {
+            final FrameContainer<?> activeWindow = WindowManager
+                    .getActiveWindow();
+            if (activeWindow instanceof Channel) {
+                controller.showChannelSettingsDialog(((Channel) activeWindow));
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void menuSelected(final MenuEvent e) {
+        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
+
+        join.setEnabled(activeWindow != null && activeWindow.getServer()
+                != null && activeWindow.getServer().getState()
+                == ServerState.CONNECTED);
+        csd.setEnabled(activeWindow instanceof Channel && activeWindow
+                .getServer() != null && activeWindow.getServer().getState()
+                == ServerState.CONNECTED);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void menuDeselected(final MenuEvent e) {
+        //Ignore
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void menuCanceled(final MenuEvent e) {
+        //Ignore
+    }
+}

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

@@ -0,0 +1,109 @@
+/*
+ * 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.menubar;
+
+import com.dmdirc.ServerManager;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
+import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+/**
+ * A menu providing help commands to the menu bar.
+ */
+public class HelpMenu extends JMenu 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;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Main frame. */
+    private final MainFrame mainFrame;
+
+    /**
+     * Instantiates a new help menu.
+     *
+     * @param controller Swing controller
+     * @param mainFrame Main frame
+     */
+    public HelpMenu(final SwingController controller,
+            final MainFrame mainFrame) {
+        super("Help");
+        this.controller = controller;
+        this.mainFrame = mainFrame;
+        setMnemonic('h');
+        initHelpMenu();
+    }
+
+    /**
+     * Initialises the help menu.
+     */
+    private void initHelpMenu() {
+        JMenuItem menuItem;
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('j');
+        menuItem.setText("Join Dev channel");
+        menuItem.setActionCommand("JoinDevChat");
+        menuItem.addActionListener(this);
+        add(menuItem);
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('f');
+        menuItem.setText("Send Feedback");
+        menuItem.setActionCommand("feedback");
+        menuItem.addActionListener(this);
+        add(menuItem);
+
+        if (!Apple.isAppleUI()) {
+            menuItem = new JMenuItem();
+            menuItem.setMnemonic('a');
+            menuItem.setText("About");
+            menuItem.setActionCommand("About");
+            menuItem.addActionListener(this);
+            add(menuItem);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getActionCommand().equals("About")) {
+            AboutDialog.showAboutDialog(mainFrame, controller.getURLHandler());
+        } else if (e.getActionCommand().equals("JoinDevChat")) {
+            ServerManager.getServerManager().joinDevChat();
+        } else if (e.getActionCommand().equals("feedback")) {
+            FeedbackDialog.showFeedbackDialog(mainFrame);
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+/*
+ * 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.menubar;
+
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.MDIBar;
+import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
+
+import java.awt.Component;
+
+import javax.swing.Box;
+import javax.swing.JMenuBar;
+
+import net.miginfocom.layout.PlatformDefaults;
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * DMDirc menu bar.
+ */
+public class MenuBar extends JMenuBar {
+
+    /**
+     * 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;
+    /** Normal menu count. */
+    private final int menuItemCount;
+
+    /**
+     * Instantiates a new menu bar.
+     *
+     * @param controller Swing controller
+     * @param mainFrame Main frame
+     */
+    public MenuBar(final SwingController controller,
+            final MainFrame mainFrame) {
+        super();
+
+        setLayout(new MigLayout("ins 0, fillx"));
+
+        add(new ServerMenu(controller, mainFrame));
+        add(new ChannelMenu(controller, mainFrame));
+        add(new SettingsMenu(controller, mainFrame));
+        add(new WindowMenuFrameManager(controller));
+        add(new HelpMenu(controller, mainFrame));
+        final int tempCount = getComponentCount();
+        add(Box.createHorizontalGlue(), "growx, pushx");
+        add(new MDIBar(controller, mainFrame));
+        add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1)
+                .getUnit()));
+        menuItemCount = getComponentCount() - tempCount;
+
+        getActionMap().setParent(null);
+        getActionMap().clear();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addImpl(final Component comp, final Object constraints,
+            final int index) {
+        super.addImpl(comp, constraints, getComponentCount() - menuItemCount);
+    }
+}

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

@@ -0,0 +1,175 @@
+/*
+ * 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.menubar;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.ServerState;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+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 com.dmdirc.ui.WindowManager;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+/**
+ * A menu providing server related commands to the menu bar.
+ */
+public class ServerMenu extends JMenu implements ActionListener,
+        MenuListener {
+
+    /**
+     * 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;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Main frame. */
+    private final MainFrame mainFrame;
+    /** Menu items which can be enabled/disabled. */
+    private JMenuItem ssd, disconnect, serverlist;
+
+    /**
+     * Creates a new Server menu.
+     *
+     * @param controller Parent swing controller
+     * @param mainFrame Parent main frame
+     */
+    public ServerMenu(final SwingController controller,
+            final MainFrame mainFrame) {
+        super("Server");
+        this.controller = controller;
+        this.mainFrame = mainFrame;
+        setMnemonic('s');
+        addMenuListener(this);
+        initServerMenu();
+        menuSelected(null);
+    }
+
+    /**
+     * 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');
+        menuItem.setActionCommand("NewServer");
+        menuItem.addActionListener(this);
+        add(menuItem);
+
+        disconnect = new JMenuItem();
+        disconnect.setText("Disconnect");
+        disconnect.setMnemonic('d');
+        disconnect.setActionCommand("Disconnect");
+        disconnect.addActionListener(this);
+        add(disconnect);
+
+        ssd = new JMenuItem();
+        ssd.setMnemonic('s');
+        ssd.setText("Server settings");
+        ssd.setActionCommand("ServerSettings");
+        ssd.addActionListener(this);
+        add(ssd);
+
+        if (!Apple.isAppleUI()) {
+            menuItem = new JMenuItem();
+            menuItem.setText("Exit");
+            menuItem.setMnemonic('x');
+            menuItem.setActionCommand("Exit");
+            menuItem.addActionListener(this);
+            add(menuItem);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if ("NewServer".equals(e.getActionCommand())) {
+            NewServerDialog.showNewServerDialog(mainFrame);
+        } else if (e.getActionCommand().equals("ServerList")) {
+            ServerListDialog.showServerListDialog(mainFrame,
+                    controller.getURLHandler());
+        } else if (e.getActionCommand().equals("Exit")) {
+            mainFrame.quit();
+        } else if (e.getActionCommand().equals("ServerSettings")) {
+            controller.showServerSettingsDialog(WindowManager
+                    .getActiveServer());
+        } else if (e.getActionCommand().equals("Disconnect")) {
+            WindowManager.getActiveServer().disconnect();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void menuSelected(final MenuEvent e) {
+        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
+
+        ssd.setEnabled(activeWindow != null && activeWindow
+                .getServer() != null && activeWindow.getServer().getState()
+                == ServerState.CONNECTED);
+        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
+    }
+}

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

@@ -0,0 +1,115 @@
+/*
+ * 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.menubar;
+
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+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.prefs.SwingPreferencesDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+/**
+ * A menu to add settings related commands to the menu bar.
+ */
+public class SettingsMenu extends JMenu 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;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Main frame. */
+    private final MainFrame mainFrame;
+
+    public SettingsMenu(final SwingController controller,
+            final MainFrame mainFrame) {
+        super("Settings");
+        this.controller = controller;
+        this.mainFrame = mainFrame;
+        setMnemonic('e');
+        initSettingsMenu();
+    }
+
+    /**
+     * Initialises the settings menu.
+     */
+    private void initSettingsMenu() {
+        JMenuItem menuItem;
+
+        if (!Apple.isAppleUI()) {
+            menuItem = new JMenuItem();
+            menuItem.setText("Preferences");
+            menuItem.setMnemonic('p');
+            menuItem.setActionCommand("Preferences");
+            menuItem.addActionListener(this);
+            add(menuItem);
+        }
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('m');
+        menuItem.setText("Profile Manager");
+        menuItem.setActionCommand("Profile");
+        menuItem.addActionListener(this);
+        add(menuItem);
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('a');
+        menuItem.setText("Actions Manager");
+        menuItem.setActionCommand("Actions");
+        menuItem.addActionListener(this);
+        add(menuItem);
+
+        menuItem = new JMenuItem();
+        menuItem.setMnemonic('l');
+        menuItem.setText("Alias Manager");
+        menuItem.setActionCommand("Aliases");
+        menuItem.addActionListener(this);
+        add(menuItem);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if ("Preferences".equals(e.getActionCommand())) {
+            SwingPreferencesDialog.showSwingPreferencesDialog(controller);
+        } else if (e.getActionCommand().equals("Profile")) {
+            ProfileManagerDialog.showProfileManagerDialog(mainFrame);
+        }  else if (e.getActionCommand().equals("Actions")) {
+            ActionsManagerDialog.showActionsManagerDialog(mainFrame,
+                    controller);
+        } else if (e.getActionCommand().equals("Aliases")) {
+            AliasManagerDialog.showAliasManagerDialog(mainFrame);
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+/*
+ * 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.dialogs;
+
+import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.WindowManager;
+
+import java.awt.Dialog.ModalityType;
+import java.awt.Window;
+
+/**
+ * A dialog to prompt the user for a channel and then join that channel.
+ */
+public class ChannelJoinDialog extends StandardInputDialog {
+
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Creates a new dialog which prompts a user and then joins the channel
+     * they specify.
+     *
+     * @param owner Parent window
+     * @param modality Window modality
+     * @param title Window title
+     * @param message Window message
+     */
+    public ChannelJoinDialog(final Window owner, final ModalityType modality,
+            final String title, final String message) {
+        super(owner, modality, title, message);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean save() {
+        WindowManager.getActiveServer().join(new ChannelJoinRequest(getText()));
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void cancelled() {
+        //Ignore
+    }
+}