Remove some statusbar manager uses.

src/com/dmdirc/Server.java

@@ -32,6 +32,7 @@ import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerNopingEvent;
 import com.dmdirc.events.ServerNumericEvent;
+import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
@@ -59,7 +60,6 @@ import com.dmdirc.tls.CertificateManager;
 import com.dmdirc.tls.CertificateProblemListener;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -177,8 +177,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     private final RawFactory rawFactory;
     /** The config provider to write user settings to. */
     private final ConfigProvider userSettings;
-    /** The manager to use to add status bar messages. */
-    private final StatusBarManager statusBarManager;
     /** Executor service to use to schedule repeated events. */
     private final ScheduledExecutorService executorService;
     /** The message encoder factory to create a message encoder with. */
@@ -200,7 +198,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      * @param tabCompleterFactory   The factory to use for tab completers.
      * @param identityFactory       The factory to use to create identities.
      * @param messageSinkManager    The sink manager to use to dispatch messages.
-     * @param statusBarManager      The manager to use to add status bar messages.
      * @param windowManager         Window Manager
      * @param channelFactory        The factory to use to create channels.
      * @param queryFactory          The factory to use to create queries.
@@ -221,7 +218,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
             final MessageSinkManager messageSinkManager,
-            final StatusBarManager statusBarManager,
             final WindowManager windowManager,
             final ChannelFactory channelFactory,
             final QueryFactory queryFactory,
@@ -260,7 +256,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         this.rawFactory = rawFactory;
         this.executorService = executorService;
         this.userSettings = userSettings;
-        this.statusBarManager = statusBarManager;
         this.messageEncoderFactory = messageEncoderFactory;
 
         eventHandler = new ServerEventHandler(this, eventBus);
@@ -1326,10 +1321,10 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      * Called when we fail to receive a ping reply within a set period of time.
      */
     public void onPingFailed() {
-        statusBarManager.setMessage(new StatusMessage(
+        getEventBus().publishAsync(new StatusBarMessageEvent(new StatusMessage(
                 "No ping reply from " + getName() + " for over "
-                + (int) Math.floor(parser.getPingTime() / 1000.0)
-                + " seconds.", getConfigManager()));
+                        + (int) Math.floor(parser.getPingTime() / 1000.0)
+                        + " seconds.", getConfigManager())));
 
         getEventBus().publishAsync(new ServerNopingEvent(this, parser.getPingTime()));
 

src/com/dmdirc/ServerFactoryImpl.java

@@ -28,7 +28,6 @@ import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
@@ -51,7 +50,6 @@ public class ServerFactoryImpl {
     private final TabCompleterFactory tabCompleterFactory;
     private final IdentityFactory identityFactory;
     private final MessageSinkManager messageSinkManager;
-    private final StatusBarManager statusBarManager;
     private final WindowManager windowManager;
     private final Provider<ChannelFactory> channelFactory;
     private final Provider<QueryFactory> queryFactory;
@@ -69,7 +67,6 @@ public class ServerFactoryImpl {
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
             final MessageSinkManager messageSinkManager,
-            final StatusBarManager statusBarManager,
             final WindowManager windowManager,
             final Provider<ChannelFactory> channelFactory,
             final Provider<QueryFactory> queryFactory,
@@ -84,7 +81,6 @@ public class ServerFactoryImpl {
         this.tabCompleterFactory = tabCompleterFactory;
         this.identityFactory = identityFactory;
         this.messageSinkManager = messageSinkManager;
-        this.statusBarManager = statusBarManager;
         this.windowManager = windowManager;
         this.channelFactory = channelFactory;
         this.queryFactory = queryFactory;
@@ -103,9 +99,9 @@ public class ServerFactoryImpl {
             final URI uri,
             final ConfigProvider profile) {
         return new Server(manager.get(), configMigrator, commandParser, parserFactory,
-                tabCompleterFactory, identityFactory, messageSinkManager, statusBarManager,
-                windowManager, channelFactory.get(), queryFactory.get(), rawFactory.get(),
-                urlBuilder, eventBus, messageEncoderFactory, userSettings, executorService, uri,
-                profile, colourManagerFactory);
+                tabCompleterFactory, identityFactory, messageSinkManager, windowManager,
+                channelFactory.get(), queryFactory.get(), rawFactory.get(),urlBuilder, eventBus,
+                messageEncoderFactory, userSettings, executorService, uri, profile,
+                colourManagerFactory);
     }
 }

src/com/dmdirc/messages/StatusBarMessageSink.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.messages;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.messages.Formatter;
 
 import java.util.Date;
@@ -39,17 +40,17 @@ public class StatusBarMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */
     private static final Pattern PATTERN = Pattern.compile("statusbar");
-    /** The status bar manager to add messages to. */
-    private final StatusBarManager statusBarManager;
+    /** The event bus to post status messages to. */
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link StatusBarMessageSink}.
      *
-     * @param statusBarManager The status bar manager to add messages to.
+     * @param eventBus The event bus to post status messages to
      */
     @Inject
-    public StatusBarMessageSink(final StatusBarManager statusBarManager) {
-        this.statusBarManager = statusBarManager;
+    public StatusBarMessageSink(final DMDircMBassador eventBus) {
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -64,7 +65,8 @@ public class StatusBarMessageSink implements MessageSink {
             final String messageType, final Object... args) {
         final String message = Formatter.formatMessage(source.getConfigManager(),
                 messageType, args);
-        statusBarManager.setMessage(new StatusMessage(message, source.getConfigManager()));
+        eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(message,
+                source.getConfigManager())));
     }
 
 }

test/com/dmdirc/ServerTest.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -67,7 +66,6 @@ public class ServerTest {
     @Mock private ChannelFactory channelFactory;
     @Mock private QueryFactory queryFactory;
     @Mock private RawFactory rawFactory;
-    @Mock private StatusBarManager statusBarManager;
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
     @Mock private ScheduledExecutorService executorService;
@@ -92,7 +90,6 @@ public class ServerTest {
                 tabCompleterFactory,
                 identityFactory,
                 messageSinkManager,
-                statusBarManager,
                 windowManager,
                 channelFactory,
                 queryFactory,