Move initUISettings into plugin load

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

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

@@ -248,9 +248,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        // Init the UI settings before we start any DI, as we might create frames etc.
-        initUISettings();
-
         setObjectGraph(graph.plus(new SwingModule(this, pluginInfo.getDomain())));
         getObjectGraph().validate();
         swingManager = getObjectGraph().get(SwingManager.class);
@@ -269,6 +266,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
                     "Swing UI can't be run in a headless environment");
         }
 
+        // Init the UI settings before we start any DI, as we might create frames etc.
+        initUISettings();
         swingManager.load();
 
         UIUtilities.invokeAndWait(new Runnable() {

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

@@ -54,12 +54,12 @@ public class SwingManager {
     /** The event queue to use. */
     private final DMDircEventQueue eventQueue;
     /** The window factory in use. */
-    private final SwingWindowFactory windowFactory;
+    private final Provider<SwingWindowFactory> windowFactory;
     /** The status bar manager to register our status bar with. */
     private final StatusBarManager statusBarManager;
-    private final MenuBar menuBar;
+    private final Provider<MenuBar> menuBar;
     /** The status bar in use. */
-    private final SwingStatusBar statusBar;
+    private final Provider<SwingStatusBar> statusBar;
     /** The window manager to listen on for events. */
     private final WindowManager windowManager;
     private final CtrlTabWindowManager ctrlTabManager;
@@ -82,7 +82,7 @@ public class SwingManager {
     /** The provider to use to create new main frames. */
     private final Provider<MainFrame> mainFrameProvider;
     /** Swing window manager. */
-    private final SwingWindowManager swingWindowManager;
+    private final Provider<SwingWindowManager> swingWindowManager;
     /** The main frame of the Swing UI. */
     private MainFrame mainFrame;
 
@@ -110,12 +110,12 @@ public class SwingManager {
     @Inject
     public SwingManager(
             final DMDircEventQueue eventQueue,
-            final SwingWindowFactory windowFactory,
+            final Provider<SwingWindowFactory> windowFactory,
             final WindowManager windowManager,
             final StatusBarManager statusBarManager,
             final Provider<MainFrame> mainFrameProvider,
-            final MenuBar menuBar,
-            final SwingStatusBar statusBar,
+            final Provider<MenuBar> menuBar,
+            final Provider<SwingStatusBar> statusBar,
             final CtrlTabWindowManager ctrlTabManager,
             final DialogKeyListener dialogKeyListener,
             final Provider<FirstRunWizardExecutor> firstRunExecutor,
@@ -125,7 +125,7 @@ public class SwingManager {
             final EventBus eventBus,
             final TreeFrameManagerProvider treeProvider,
             final ButtonBarProvider buttonProvider,
-            final SwingWindowManager swingWindowManager) {
+            final Provider<SwingWindowManager> swingWindowManager) {
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
@@ -150,16 +150,16 @@ public class SwingManager {
      */
     public void load() {
         this.mainFrame = mainFrameProvider.get();
-        this.mainFrame.setMenuBar(menuBar);
+        this.mainFrame.setMenuBar(menuBar.get());
         this.mainFrame.setWindowManager(ctrlTabManager);
-        this.mainFrame.setStatusBar(statusBar);
+        this.mainFrame.setStatusBar(statusBar.get());
         this.mainFrame.initComponents();
 
         installEventQueue();
         installKeyListener();
 
-        windowManager.addListenerAndSync(windowFactory);
-        statusBarManager.registerStatusBar(statusBar);
+        windowManager.addListenerAndSync(windowFactory.get());
+        statusBarManager.registerStatusBar(statusBar.get());
         eventBus.register(linkHandler);
     }
 
@@ -170,13 +170,13 @@ public class SwingManager {
         uninstallEventQueue();
         uninstallKeyListener();
 
-        for (final Window window : swingWindowManager.getTopLevelWindows()) {
+        for (final Window window : swingWindowManager.get().getTopLevelWindows()) {
             window.dispose();
         }
-        windowManager.removeListener(windowFactory);
-        windowFactory.dispose();
+        windowManager.removeListener(windowFactory.get());
+        windowFactory.get().dispose();
         mainFrame.dispose();
-        statusBarManager.unregisterStatusBar(statusBar);
+        statusBarManager.unregisterStatusBar(statusBar.get());
         eventBus.unregister(linkHandler);
     }
 

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -65,8 +65,6 @@ public class SwingStatusBar extends JPanel implements StatusBar {
     /**
      * Creates a new instance of SwingStatusBar.
      *
-     * @param controller   Swing controller
-     * @param mainFrame    Main frame
      * @param inviteLabel  The invite label to add to the status bar.
      * @param updaterLabel The updater label to add to the status bar.
      * @param errorLabel   The error label to add to the status bar.