Create the status bar on the EDT.

Oopsy.

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

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

@@ -33,8 +33,6 @@ import com.dmdirc.ui.StatusMessage;
 import java.awt.Component;
 import java.util.Arrays;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -45,7 +43,6 @@ import net.miginfocom.swing.MigLayout;
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 
 /** Status bar, shows message and info on the GUI. */
-@Singleton
 public class SwingStatusBar extends JPanel implements StatusBar {
 
     /**
@@ -76,7 +73,6 @@ public class SwingStatusBar extends JPanel implements StatusBar {
      * @param updaterLabel The updater label to add to the status bar.
      * @param messageLabel The message label to add to the status bar.
      */
-    @Inject
     public SwingStatusBar(
             final SwingController controller,
             final MainFrame mainFrame,

src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -41,6 +41,10 @@ import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
+import com.dmdirc.addons.ui_swing.components.statusbar.InviteLabel;
+import com.dmdirc.addons.ui_swing.components.statusbar.MessageLabel;
+import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.components.statusbar.UpdaterLabel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -120,7 +124,7 @@ public class SwingModule {
             public MainFrame call() {
                 return new MainFrame(
                         apple,
-                        controller,
+                        swingController,
                         windowFactory,
                         lifecycleController,
                         globalConfig,
@@ -132,6 +136,23 @@ public class SwingModule {
         });
     }
 
+    @Provides
+    @Singleton
+    public SwingStatusBar getSwingStatusBar(
+            final SwingController swingController,
+            final MainFrame mainFrame,
+            final InviteLabel inviteLabel,
+            final UpdaterLabel updaterLabel,
+            final MessageLabel messageLabel) {
+        return UIUtilities.invokeAndWait(new Callable<SwingStatusBar>() {
+            @Override
+            public SwingStatusBar call() {
+                return new SwingStatusBar(swingController, mainFrame, inviteLabel, updaterLabel,
+                        messageLabel);
+            }
+        });
+    }
+
     @Provides
     @Singleton
     public URLHandler getURLHandler(