Inject the menu bar and menus.

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

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

@@ -375,10 +375,6 @@ public class MainFrame extends JFrame implements WindowListener,
         initFrameManagers();
         mainSplitPane = initSplitPane();
 
-        final MenuBar menu = new MenuBar(controller, windowFactory, this);
-        controller.getApple().setMenuBar(menu);
-        setJMenuBar(menu);
-
         setPreferredSize(new Dimension(800, 600));
 
         getContentPane().setLayout(new MigLayout(
@@ -390,6 +386,22 @@ public class MainFrame extends JFrame implements WindowListener,
         pack();
     }
 
+    /**
+     * Sets the menu bar that this frame will use.
+     *
+     * @param menuBar The menu bar to use.
+     */
+    public void setMenuBar(final MenuBar menuBar) {
+        UIUtilities.invokeAndWait(new Runnable() {
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                controller.getApple().setMenuBar(menuBar);
+                setJMenuBar(menuBar);
+            }
+        });
+    }
+
     /**
      * Lays out the this component.
      */

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.ui.WindowManager;
 
 import java.awt.Toolkit;
@@ -54,17 +55,21 @@ public class SwingManager {
      * @param windowFactory The window factory in use.
      * @param windowManager The window manager to listen on for events.
      * @param mainFrame The main frame of the Swing UI.
+     * @param menuBar The menu bar to use for the main frame.
      */
     @Inject
     public SwingManager(
             final DMDircEventQueue eventQueue,
             final SwingWindowFactory windowFactory,
             final WindowManager windowManager,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            final MenuBar menuBar) {
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
+
         this.mainFrame = mainFrame;
+        this.mainFrame.setMenuBar(menuBar);
     }
 
     /**

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

@@ -34,6 +34,8 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
@@ -42,6 +44,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Provides an MDI style bar for closing frames.
  */
+@Singleton
 public class MDIBar extends JPanel implements SwingWindowListener,
         SelectionListener, ActionListener, ConfigChangeListener {
 
@@ -71,6 +74,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame Main frame instance
      */
+    @Inject
     public MDIBar(
             final SwingController controller,
             final SwingWindowFactory windowFactory,

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

@@ -24,8 +24,6 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.SwingWindowFactory;
-import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 
 import javax.swing.JFrame;
 
@@ -42,16 +40,13 @@ public class AppleJFrame extends JFrame {
      * Create a new Apple JFrame
      *
      * @param parentWindow Main Window
-     * @param windowFactory The window factory to use to create and listen for windows.
      * @param controller Parent swing controller
      */
     public AppleJFrame(
             final MainFrame parentWindow,
-            final SwingWindowFactory windowFactory,
             final SwingController controller) {
         super();
-        final MenuBar menu = new MenuBar(controller, windowFactory, parentWindow);
-        controller.getApple().setMenuBar(menu);
-        setJMenuBar(menu);
+        controller.getApple().setMenuBar(parentWindow.getJMenuBar());
+        setJMenuBar(parentWindow.getJMenuBar());
     }
 }

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

@@ -35,6 +35,8 @@ import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.event.MenuEvent;
@@ -43,6 +45,7 @@ import javax.swing.event.MenuListener;
 /**
  * A menu to provide channel related commands in the menu bar.
  */
+@Singleton
 public class ChannelMenu extends JMenu implements ActionListener,
         MenuListener {
 
@@ -65,7 +68,9 @@ public class ChannelMenu extends JMenu implements ActionListener,
      * @param controller Parent swing controller.
      * @param mainFrame Parent mainframe
      */
-    public ChannelMenu(final SwingController controller,
+    @Inject
+    public ChannelMenu(
+            final SwingController controller,
             final MainFrame mainFrame) {
         super("Channel");
         this.controller = controller;
@@ -112,8 +117,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
                         .display();
                 break;
             case "ChannelSettings":
-                final FrameContainer activeWindow = controller.getMainFrame()
-                        .getActiveFrame().getContainer();
+                final FrameContainer activeWindow = mainFrame.getActiveFrame().getContainer();
                 if (activeWindow instanceof Channel) {
                     controller.showChannelSettingsDialog(((Channel) activeWindow));
                 }   break;

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

@@ -30,12 +30,15 @@ import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
 /**
  * A menu providing help commands to the menu bar.
  */
+@Singleton
 public class HelpMenu extends JMenu implements ActionListener {
 
     /** Serial version UID. */
@@ -48,6 +51,7 @@ public class HelpMenu extends JMenu implements ActionListener {
      *
      * @param controller Swing controller
      */
+    @Inject
     public HelpMenu(final SwingController controller) {
         super("Help");
         this.controller = controller;

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

@@ -22,14 +22,13 @@
 
 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.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.MDIBar;
 import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
 
 import java.awt.Component;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
@@ -41,6 +40,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * DMDirc menu bar.
  */
+@Singleton
 public class MenuBar extends JMenuBar {
 
     /**
@@ -55,26 +55,33 @@ public class MenuBar extends JMenuBar {
     /**
      * Instantiates a new menu bar.
      *
-     * @param controller Swing controller
-     * @param windowFactory The window factory to use to create and listen for windows.
-     * @param mainFrame Main frame
+     * @param serverMenu The server menu to use.
+     * @param channelMenu The channel menu to use.
+     * @param settingsMenu The settings menu to use.
+     * @param windowMenu The window menu to use.
+     * @param helpMenu The help menu to use.
+     * @param mdiBar The MDI bar to use.
      */
+    @Inject
     public MenuBar(
-            final SwingController controller,
-            final SwingWindowFactory windowFactory,
-            final MainFrame mainFrame) {
+            final ServerMenu serverMenu,
+            final ChannelMenu channelMenu,
+            final SettingsMenu settingsMenu,
+            final WindowMenuFrameManager windowMenu,
+            final HelpMenu helpMenu,
+            final MDIBar mdiBar) {
         super();
 
         setLayout(new MigLayout("ins 0, fillx"));
 
-        add(new ServerMenu(controller, mainFrame));
-        add(new ChannelMenu(controller, mainFrame));
-        add(new SettingsMenu(controller));
-        add(new WindowMenuFrameManager(controller, windowFactory, mainFrame));
-        add(new HelpMenu(controller));
+        add(serverMenu);
+        add(channelMenu);
+        add(settingsMenu);
+        add(windowMenu);
+        add(helpMenu);
         final int tempCount = getComponentCount();
         add(Box.createHorizontalGlue(), "growx, pushx");
-        add(new MDIBar(controller, windowFactory, mainFrame));
+        add(mdiBar);
         add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1)
                 .getUnit()));
         menuItemCount = getComponentCount() - tempCount;

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

@@ -33,6 +33,8 @@ import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.event.MenuEvent;
@@ -41,6 +43,7 @@ import javax.swing.event.MenuListener;
 /**
  * A menu providing server related commands to the menu bar.
  */
+@Singleton
 public class ServerMenu extends JMenu implements ActionListener,
         MenuListener {
 
@@ -63,7 +66,9 @@ public class ServerMenu extends JMenu implements ActionListener,
      * @param controller Parent swing controller
      * @param mainFrame Parent main frame
      */
-    public ServerMenu(final SwingController controller,
+    @Inject
+    public ServerMenu(
+            final SwingController controller,
             final MainFrame mainFrame) {
         super("Server");
         this.controller = controller;
@@ -120,12 +125,11 @@ public class ServerMenu extends JMenu implements ActionListener,
                 mainFrame.quit();
                 break;
             case "ServerSettings":
-                controller.showServerSettingsDialog(controller.getMainFrame()
-                        .getActiveFrame().getContainer().getServer());
+                controller.showServerSettingsDialog(
+                        mainFrame.getActiveFrame().getContainer().getServer());
                 break;
             case "Disconnect":
-                controller.getMainFrame().getActiveFrame().getContainer()
-                        .getServer().disconnect();
+                mainFrame.getActiveFrame().getContainer().getServer().disconnect();
                 break;
         }
     }

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

@@ -32,12 +32,15 @@ import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
 /**
  * A menu to add settings related commands to the menu bar.
  */
+@Singleton
 public class SettingsMenu extends JMenu implements ActionListener {
 
     /** Serial version UID. */
@@ -45,6 +48,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
     /** Swing controller. */
     private final SwingController controller;
 
+    @Inject
     public SettingsMenu(final SwingController controller) {
         super("Settings");
         this.controller = controller;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -108,9 +108,9 @@ public final class ActionsManagerDialog extends StandardDialog implements
     @SuppressWarnings("unchecked")
     public ActionsManagerDialog(final Window parentWindow,
             final SwingController controller) {
-        super(controller, Apple.isAppleUI() ?
-                new AppleJFrame((MainFrame) parentWindow,
-                controller.getWindowFactory(), controller) : null, ModalityType.MODELESS);
+        super(controller, Apple.isAppleUI()
+                ? new AppleJFrame((MainFrame) parentWindow, controller)
+                : null, ModalityType.MODELESS);
 
         initComponents();
         validator = new ValidatorChain<>(

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -43,6 +43,8 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.AbstractButton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -52,7 +54,8 @@ import javax.swing.JSeparator;
 /**
  * Manages the window menu window list.
  */
-public final class WindowMenuFrameManager extends JMenu implements
+@Singleton
+public class WindowMenuFrameManager extends JMenu implements
         SwingWindowListener, ActionListener, SelectionListener {
 
     /**
@@ -86,6 +89,7 @@ public final class WindowMenuFrameManager extends JMenu implements
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame The frame that owns this manager
      */
+    @Inject
     public WindowMenuFrameManager(
             final SwingController controller,
             final SwingWindowFactory windowFactory,