FrameManagers now own and manage an EventBus.

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

src/com/dmdirc/Channel.java

@@ -44,7 +44,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.ChildEventBusManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
@@ -91,10 +90,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
     private volatile boolean showModePrefix;
     /** Whether we should show colours in nicks. */
     private volatile boolean showColours;
-    /** The manager to use to manage our event bus. */
-    private final ChildEventBusManager eventBusManager;
-    /** The bus to despatch events on. */
-    private final EventBus eventBus;
 
     /**
      * Creates a new instance of Channel.
@@ -126,7 +121,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
                         CommandType.TYPE_CHAT),
                 messageSinkManager,
                 urlBuilder,
-                eventBus, // TODO: This should be the channel's own event bus.
+                newServer.getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier(),
                         WindowComponent.TOPICBAR.getIdentifier(),
@@ -135,9 +130,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         this.configMigrator = configMigrator;
         this.channelInfo = newChannelInfo;
         this.server = newServer;
-        this.eventBusManager = new ChildEventBusManager(eventBus);
-        this.eventBusManager.connect();
-        this.eventBus = eventBusManager.getChildBus();
 
         getConfigManager().addChangeListener("channel", this);
         getConfigManager().addChangeListener("ui", "shownickcoloursintext", this);
@@ -157,11 +149,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         selfJoin();
     }
 
-    @Override
-    public EventBus getEventBus() {
-        return eventBus;
-    }
-
     public ChannelInfo getChannelInfo() {
         return channelInfo;
     }
@@ -329,12 +316,10 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
         }
 
         // Trigger action for the window closing
-        eventBus.post(new ChannelClosedEvent(this));
+        getEventBus().post(new ChannelClosedEvent(this));
 
         // Inform any parents that the window is closing
         server.delChannel(channelInfo.getName());
-
-        eventBusManager.disconnect();
     }
 
     /**

src/com/dmdirc/ClientModule.java

@@ -197,10 +197,9 @@ public class ClientModule {
     public MessageSinkManager getMessageSinkManager(
             final StatusBarManager statusBarManager,
             final WindowManager windowManager,
-            final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final URLBuilder urlBuilder) {
         final MessageSinkManager messageSinkManager = new MessageSinkManager();
-        messageSinkManager.loadDefaultSinks(statusBarManager, windowManager, urlBuilder, eventBus);
+        messageSinkManager.loadDefaultSinks(statusBarManager, windowManager, urlBuilder);
         return messageSinkManager;
     }
 

src/com/dmdirc/CustomWindow.java

@@ -44,15 +44,14 @@ public class CustomWindow extends FrameContainer {
      * @param title      The title of this custom window
      * @param parent     The parent of this custom window
      * @param urlBuilder The URL builder to use when finding icons.
-     * @param eventBus   The bus to despatch events on.
      */
     public CustomWindow(
             final String name,
             final String title,
             final FrameContainer parent,
-            final URLBuilder urlBuilder,
-            final EventBus eventBus) {
-        super(parent, "custom", name, title, parent.getConfigManager(), urlBuilder, eventBus,
+            final URLBuilder urlBuilder) {
+        super(parent, "custom", name, title, parent.getConfigManager(), urlBuilder,
+                parent.getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 

src/com/dmdirc/FrameContainer.java

@@ -39,6 +39,7 @@ import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.ChildEventBusManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -93,6 +94,8 @@ public abstract class FrameContainer {
     private final Object styliserSync = new Object();
     /** Object used to synchronise styliser access. */
     private final Object documentSync = new Object();
+    /** The manager to use to manage our event bus. */
+    private final ChildEventBusManager eventBusManager;
     /** Event bus to despatch events to. */
     private final EventBus eventBus;
     /** The icon manager to use for this container. */
@@ -147,12 +150,15 @@ public abstract class FrameContainer {
         this.title = title;
         this.components = new HashSet<>(components);
         this.iconManager = new IconManager(configManager, urlBuilder);
-        this.eventBus = eventBus;
         this.writable = false;
         this.commandParser = Optional.absent();
         this.tabCompleter = Optional.absent();
         this.messageSinkManager = Optional.absent();
 
+        this.eventBusManager = new ChildEventBusManager(eventBus);
+        this.eventBusManager.connect();
+        this.eventBus = eventBusManager.getChildBus();
+
         setIcon(icon);
     }
 
@@ -168,7 +174,7 @@ public abstract class FrameContainer {
      * @param commandParser      The command parser to use for input.
      * @param tabCompleter       The tab completer to use.
      * @param messageSinkManager The manager to use to despatch notifications.
-     * @param eventbus           The bus to despatch events on.
+     * @param eventBus           The bus to despatch events on.
      * @param components         The UI components that this frame requires
      *
      * @since 0.6.4
@@ -183,7 +189,7 @@ public abstract class FrameContainer {
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
-            final EventBus eventbus,
+            final EventBus eventBus,
             final Collection<String> components) {
         this.parent = Optional.fromNullable(parent);
         this.configManager = config;
@@ -191,13 +197,16 @@ public abstract class FrameContainer {
         this.title = title;
         this.components = new HashSet<>(components);
         this.iconManager = new IconManager(configManager, urlBuilder);
-        this.eventBus = eventbus;
         this.writable = true;
         this.commandParser = Optional.of(commandParser);
         this.tabCompleter = Optional.of(tabCompleter);
         this.messageSinkManager = Optional.of(messageSinkManager);
         commandParser.setOwner(this);
 
+        this.eventBusManager = new ChildEventBusManager(eventBus);
+        this.eventBusManager.connect();
+        this.eventBus = eventBusManager.getChildBus();
+
         setIcon(icon);
     }
 
@@ -225,6 +234,10 @@ public abstract class FrameContainer {
         return configManager;
     }
 
+    public EventBus getEventBus() {
+        return eventBus;
+    }
+
     public boolean isWritable() {
         return writable;
     }
@@ -356,6 +369,8 @@ public abstract class FrameContainer {
      * Closes this container (and its associated frame).
      */
     public void close() {
+        eventBusManager.disconnect();
+
         for (FrameCloseListener listener : listeners.get(FrameCloseListener.class)) {
             listener.windowClosing(this);
             listeners.remove(FrameCloseListener.class, listener);

src/com/dmdirc/Query.java

@@ -56,8 +56,6 @@ import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Toolkit;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -76,8 +74,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
     /** The Server this Query is on. */
     private final Server server;
-    /** Event bus to post events on. */
-    private final EventBus eventBus;
     /** The full host of the client associated with this query. */
     private String host;
     /** The nickname of the client associated with this query. */
@@ -100,8 +96,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final URLBuilder urlBuilder) {
         super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
@@ -111,12 +106,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
                 messageSinkManager,
                 urlBuilder,
-                eventBus,
+                newServer.getEventBus(),
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
 
-        this.eventBus = eventBus;
         this.server = newServer;
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
@@ -148,7 +142,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                 final DisplayableEvent event = new QuerySelfMessageEvent(this, server.getParser().
                         getLocalClient(), part);
                 event.setDisplayFormat("querySelfMessage");
-                eventBus.post(event);
+                getEventBus().post(event);
             }
         }
     }
@@ -188,7 +182,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             doNotification("querySelfAction", client, action);
             final DisplayableEvent event = new QuerySelfActionEvent(this, client, action);
             event.setDisplayFormat("querySelfAction");
-            eventBus.post(event);
+            getEventBus().post(event);
         } else {
             addLine("actionTooLong", action.length());
         }
@@ -203,7 +197,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final DisplayableEvent event = new QueryMessageEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
-        eventBus.post(event);
+        getEventBus().post(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -217,7 +211,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final DisplayableEvent event = new QueryActionEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
-        eventBus.post(event);
+        getEventBus().post(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -271,7 +265,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final DisplayableEvent event = new QueryNickchangeEvent(this, oldNick);
             event.setDisplayFormat("queryNickChanged");
-            eventBus.post(event);
+            getEventBus().post(event);
 
             server.updateQuery(this, oldNick, client.getNickname());
 
@@ -294,7 +288,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final DisplayableEvent event = new QueryQuitEvent(this, reason);
             event.setDisplayFormat(format.toString());
-            eventBus.post(event);
+            getEventBus().post(event);
 
             addLine(format, client.getNickname(),
                     client.getUsername(), client.getHostname(), reason);
@@ -326,7 +320,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
 
         // Trigger action for the window closing
-        eventBus.post(new QueryClosedEvent(this));
+        getEventBus().post(new QueryClosedEvent(this));
 
         // Inform any parents that the window is closing
         if (server != null) {

src/com/dmdirc/Raw.java

@@ -37,8 +37,6 @@ import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.Arrays;
 import java.util.Date;
 
@@ -65,13 +63,12 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
             @Unbound final Server newServer,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final EventBus eventBus,
             final URLBuilder urlBuilder) {
         super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
                 new ServerCommandParser(newServer.getConfigManager(), commandController),
                 newServer.getTabCompleter(),
                 messageSinkManager,
-                eventBus,
+                newServer.getEventBus(),
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/Server.java

@@ -174,8 +174,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     private final QueryFactory queryFactory;
     /** Factory to use for creating raw windows. */
     private final RawFactory rawFactory;
-    /** The event bus to despatch events onto. */
-    private final EventBus eventBus;
     /** The config provider to write user settings to. */
     private final ConfigProvider userSettings;
     /** The manager to use to add status bar messages. */
@@ -254,7 +252,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         this.queryFactory = queryFactory;
         this.rawFactory = rawFactory;
         this.executorService = executorService;
-        this.eventBus = eventBus;
         this.userSettings = userSettings;
         this.statusBarManager = statusBarManager;
 
@@ -380,7 +377,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             }
         }
 
-        eventBus.post(new ServerConnectingEvent(this));
+        getEventBus().post(new ServerConnectingEvent(this));
     }
 
     @Override
@@ -538,7 +535,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final Query newQuery = queryFactory.getQuery(this, host);
 
             windowManager.addWindow(this, newQuery, focus);
-            eventBus.post(new QueryOpenedEvent(newQuery));
+            getEventBus().post(new QueryOpenedEvent(newQuery));
 
             getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
@@ -622,7 +619,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final Channel newChan = channelFactory.getChannel(this, chan, channelConfig);
 
             windowManager.addWindow(this, newChan, focus);
-            eventBus.post(new ChannelOpenedEvent(newChan));
+            getEventBus().post(new ChannelOpenedEvent(newChan));
 
             getTabCompleter().addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.put(converter.toLowerCase(chan.getName()), newChan);
@@ -1201,7 +1198,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         final ServerNumericEvent event = new ServerNumericEvent(this, numeric, tokens);
         event.setDisplayFormat(target.toString());
-        eventBus.post(event);
+        getEventBus().post(event);
 
         handleNotification(event.getDisplayFormat(), (Object[]) tokens);
     }
@@ -1230,7 +1227,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         handleNotification("socketClosed", getAddress());
 
-        eventBus.post(new ServerDisconnectedEvent(this));
+        getEventBus().post(new ServerDisconnectedEvent(this));
 
         eventHandler.unregisterCallbacks();
 
@@ -1337,7 +1334,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 }
             }
 
-            eventBus.post(new ServerConnectErrorEvent(this, description));
+            getEventBus().post(new ServerConnectErrorEvent(this, description));
 
             handleNotification("connectError", getAddress(), description);
 
@@ -1418,7 +1415,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             }, whoTime, whoTime, TimeUnit.MILLISECONDS);
         }
 
-        eventBus.post(new ServerConnectedEvent(this));
+        getEventBus().post(new ServerConnectedEvent(this));
     }
 
     /**

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -129,7 +129,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
                     windowManager.addWindow(newWindow);
                 } else {
                     newWindow = new CustomWindow(args.getArguments()[start], title, parent,
-                            urlBuilder, eventBus);
+                            urlBuilder);
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -28,8 +28,6 @@ import com.dmdirc.Server;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.Date;
 import java.util.regex.Pattern;
 
@@ -44,23 +42,18 @@ public class CustomWindowMessageSink implements MessageSink {
     private final WindowManager windowManager;
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
-    /** The bus to despatch events on. */
-    private final EventBus eventBus;
 
     /**
      * Creates a new custom window message sink.
      *
      * @param windowManager Window management
      * @param urlBuilder    The URL builder to use when finding icons.
-     * @param eventBus      The bus to despatch events on.
      */
     public CustomWindowMessageSink(
             final WindowManager windowManager,
-            final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final URLBuilder urlBuilder) {
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
-        this.eventBus = eventBus;
     }
 
     @Override
@@ -78,7 +71,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    (Server) source.getConnection(), urlBuilder, eventBus);
+                    (Server) source.getConnection(), urlBuilder);
             windowManager.addWindow((Server) source.getConnection(), targetWindow);
         }
 

src/com/dmdirc/messages/MessageSinkManager.java

@@ -29,8 +29,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -129,18 +127,16 @@ public class MessageSinkManager {
      * @param statusBarManager The status bar manager to give to status-bar related sinks.
      * @param windowManager    The window manager to give to sinks that iterate windows.
      * @param urlBuilder       The URL builder to use when finding icons.
-     * @param eventBus         The bus to despatch events on.
      */
     public void loadDefaultSinks(
             final StatusBarManager statusBarManager,
             final WindowManager windowManager,
-            final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final URLBuilder urlBuilder) {
         // TODO: Dependency inject all these.
         addSink(new AllMessageSink());
         addSink(new ChannelMessageSink());
         addSink(new CommonChanelsMessageSink());
-        addSink(new CustomWindowMessageSink(windowManager, urlBuilder, eventBus));
+        addSink(new CustomWindowMessageSink(windowManager, urlBuilder));
         addSink(new ForkMessageSink());
         addSink(new FormatMessageSink());
         addSink(new GroupMessageSink());