Pass EventBus in to FrameContainer.

Change-Id: I65695d195052b7800e14f2128c84d344f61ff19c
Depends-On: I711722755bbf78de5b3ae3a6eec3e43985f4ed63
Reviewed-on: http://gerrit.dmdirc.com/3446
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -32,6 +32,8 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Arrays;
 
 /**
@@ -58,6 +60,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager  The sink manager to use to despatch messages.
      * @param urlBuilder          The URL builder to use when finding icons.
+     * @param eventBus            The bus to despatch events on.
      */
     public ChatContainer(
             final DCCChat dcc,
@@ -68,12 +71,14 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
         super(title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController),
                 messageSinkManager,
                 tabCompleterFactory,
                 urlBuilder,
+                eventBus,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -49,6 +49,8 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.File;
 import java.util.concurrent.Callable;
 
@@ -77,6 +79,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final TabCompleterFactory tabCompleterFactory;
     /** 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 instance of DCCCommand.
@@ -88,6 +92,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param windowManager       Window management
      * @param tabCompleterFactory The factory to use for tab completers.
      * @param urlBuilder          The URL builder to use when finding icons.
+     * @param eventBus            The bus to despatch events on.
      */
     @Inject
     public DCCCommand(
@@ -97,7 +102,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
         super(controller);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
@@ -105,6 +111,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         this.windowManager = windowManager;
         this.tabCompleterFactory = tabCompleterFactory;
         this.urlBuilder = urlBuilder;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -169,7 +176,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(chat, origin.getConfigManager(),
                     getController(), "*Chat: " + target, myNickname, target, tabCompleterFactory,
-                    messageSinkManager, urlBuilder);
+                    messageSinkManager, urlBuilder, eventBus);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
@@ -247,7 +254,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     final Parser parser = connection.getParser();
                     final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), "Send: " + target,
-                            target, connection, urlBuilder);
+                            target, connection, urlBuilder, eventBus);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
@@ -260,7 +267,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     if (myPlugin.listen(send)) {
                         final TransferContainer container = new TransferContainer(myPlugin, send,
                                 origin.getConfigManager(), "*Send: "
-                                + target, target, connection, urlBuilder);
+                                + target, target, connection, urlBuilder, eventBus);
                         windowManager.addWindow(myPlugin.getContainer(), container);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + selectedFile.getName() + "\" "

src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -30,6 +30,8 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Collection;
 
 /**
@@ -50,6 +52,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param messageSinkManager  The sink manager to use to despatch messages.
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param urlBuilder          The URL builder to use when finding icons.
+     * @param eventBus            The bus to despatch events on.
      * @param components          The UI components that this frame requires
      */
     public DCCFrameContainer(
@@ -60,10 +63,12 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
+            final EventBus eventBus,
             final Collection<String> components) {
         super(icon, title, title, configManager, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
                 messageSinkManager,
+                eventBus,
                 components);
     }
 

src/com/dmdirc/addons/dcc/DCCManager.java

@@ -55,6 +55,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -91,6 +93,8 @@ public class DCCManager implements ActionListener {
     private final String domain;
     /** 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 instance of this plugin.
@@ -106,6 +110,7 @@ public class DCCManager implements ActionListener {
      * @param windowFactory         The window factory to register the DCC implementations with.
      * @param componentFrameFactory Factory to use to create new component frames for DCC windows.
      * @param urlBuilder            The URL builder to use when finding icons.
+     * @param eventBus              The bus to despatch events on.
      * @param commandParser         The command parser to use for DCC windows.
      * @param baseDirectory         The directory to create a downloads directory within.
      */
@@ -122,6 +127,7 @@ public class DCCManager implements ActionListener {
             final SwingWindowFactory windowFactory,
             final ComponentFrameFactory componentFrameFactory,
             final URLBuilder urlBuilder,
+            final EventBus eventBus,
             final GlobalCommandParser commandParser,
             @Directory(DirectoryType.BASE) final String baseDirectory) {
         this.mainFrame = mainFrame;
@@ -132,6 +138,7 @@ public class DCCManager implements ActionListener {
         this.domain = pluginInfo.getDomain();
         this.config = globalConfig;
         this.urlBuilder = urlBuilder;
+        this.eventBus = eventBus;
 
         windowFactory.registerImplementation(
                 new HashSet<>(Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
@@ -221,7 +228,7 @@ public class DCCManager implements ActionListener {
                 final boolean resume = handleResume(jc);
                 if (reverse && !token.isEmpty()) {
                     TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "*Receive: " + nickname, nickname, null, urlBuilder);
+                            config, "*Receive: " + nickname, nickname, null, urlBuilder, eventBus);
                     windowManager.addWindow(getContainer(), container);
                     send.setToken(token);
                     if (resume) {
@@ -247,7 +254,7 @@ public class DCCManager implements ActionListener {
                     }
                 } else {
                     TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "Receive: " + nickname, nickname, null, urlBuilder);
+                            config, "Receive: " + nickname, nickname, null, urlBuilder, eventBus);
                     windowManager.addWindow(getContainer(), container);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
@@ -431,7 +438,7 @@ public class DCCManager implements ActionListener {
                     .getLocalClient().getNickname();
             final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
                     "Chat: " + nickname, myNickname, nickname, tabCompleterFactory,
-                    messageSinkManager, urlBuilder);
+                    messageSinkManager, urlBuilder, eventBus);
             windowManager.addWindow(getContainer(), f);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
@@ -678,7 +685,7 @@ public class DCCManager implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, mainFrame, urlBuilder);
+        container = new PlaceholderContainer(this, config, mainFrame, urlBuilder, eventBus);
         windowManager.addWindow(container);
     }
 

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -29,6 +29,8 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Dialog.ModalityType;
 import java.util.Arrays;
 
@@ -49,13 +51,15 @@ public class PlaceholderContainer extends FrameContainer {
      * @param config     Config manager
      * @param mainFrame  Frame that will own new dialogs.
      * @param urlBuilder The URL builder to use when finding icons.
+     * @param eventBus   The bus to despatch events on.
      */
     public PlaceholderContainer(
             final DCCManager plugin,
             final AggregateConfigProvider config,
             final MainFrame mainFrame,
-            final URLBuilder urlBuilder) {
-        super("dcc", "DCCs", "DCCs", config, urlBuilder,
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
+        super("dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.mainFrame = mainFrame;

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -34,6 +34,8 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Desktop;
 import java.io.File;
 import java.util.Arrays;
@@ -68,8 +70,8 @@ public class TransferContainer extends FrameContainer implements
     /** Connection the send was initiated on. */
     private Connection connection = null;
     /** Show open button. */
-    private boolean showOpen = Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(
-            Desktop.Action.OPEN);
+    private final boolean showOpen = Desktop.isDesktopSupported()
+            && Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
@@ -81,13 +83,15 @@ public class TransferContainer extends FrameContainer implements
      * @param targetNick Nickname of target
      * @param connection The connection that the send was that initiated on
      * @param urlBuilder The URL builder to use when finding icons.
+     * @param eventBus   The bus to despatch events on.
      */
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
-            final String targetNick, final Connection connection, final URLBuilder urlBuilder) {
+            final String targetNick, final Connection connection,
+            final URLBuilder urlBuilder, final EventBus eventBus) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, config, urlBuilder,
+                title, title, config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -28,6 +28,8 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Arrays;
 
 /**
@@ -42,6 +44,7 @@ public class HistoryWindow extends FrameContainer {
      * @param reader     The reader to use to get the history
      * @param parent     The window this history window was opened from
      * @param urlBuilder The URL builder to use when finding icons.
+     * @param eventBus   The bus to despatch events on.
      * @param numLines   The number of lines to show
      */
     public HistoryWindow(
@@ -49,8 +52,9 @@ public class HistoryWindow extends FrameContainer {
             final ReverseFileReader reader,
             final FrameContainer parent,
             final URLBuilder urlBuilder,
+            final EventBus eventBus,
             final int numLines) {
-        super("raw", title, title, parent.getConfigManager(), urlBuilder,
+        super("raw", title, title, parent.getConfigManager(), urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(

src/com/dmdirc/addons/logging/LoggingManager.java

@@ -825,7 +825,7 @@ public class LoggingManager implements ActionListener, ConfigChangeListener {
         }
 
         final HistoryWindow window = new HistoryWindow("History", reader, target, urlBuilder,
-                historyLines);
+                eventBus, historyLines);
         windowManager.addWindow(target, window);
 
         return true;

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Arrays;
 
 /**
@@ -51,15 +53,17 @@ public class DebugWindow extends FrameContainer {
      * @param parser     The parser this plugin is debugging
      * @param connection The connection this window is associated with.
      * @param urlBuilder The URL builder to use when finding icons.
+     * @param eventBus   The bus to despatch events on.
      */
     public DebugWindow(
             final DebugInfoListener listener,
             final String title,
             final Parser parser,
             final Connection connection,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
         super("raw", "Parser Debug", title, connection.getWindowModel().getConfigManager(),
-                urlBuilder, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;
         this.connection = connection;

src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -98,7 +98,7 @@ public class ParserDebugManager implements DebugInfoListener {
         try {
             parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
             final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
-                    connection, urlBuilder);
+                    connection, urlBuilder, eventBus);
             windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", true);

src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -28,6 +28,8 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Collections;
 import java.util.Date;
 
@@ -44,15 +46,17 @@ public class FakeWriteableFrameContainer extends FrameContainer {
      *
      * @param target             The message target that output gets sent to
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param eventBus           The bus to despatch events on.
      * @param urlBuilder         The URL builder to use when finding icons.
      */
     public FakeWriteableFrameContainer(
             final FrameContainer target,
             final MessageSinkManager messageSinkManager,
+            final EventBus eventBus,
             final URLBuilder urlBuilder) {
         super(target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), urlBuilder, target.getCommandParser(),
-                target.getTabCompleter(), messageSinkManager,
+                target.getTabCompleter(), messageSinkManager, eventBus,
                 Collections.<String>emptyList());
         this.target = target;
     }

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -36,6 +36,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 /**
@@ -53,6 +55,8 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     private final MessageSinkManager messageSinkManager;
     /** 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 instance of this command.
@@ -60,15 +64,18 @@ public class RedirectCommand extends Command implements IntelligentCommand {
      * @param controller         The controller to use for command information.
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param urlBuilder         The URL builder to use when finding icons.
+     * @param eventBus           The bus to despatch events on.
      */
     @Inject
     public RedirectCommand(
             final CommandController controller,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -76,7 +83,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final FrameContainer target = ((ChatCommandContext) context).getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
-                target, messageSinkManager, urlBuilder), args.getArgumentsAsString());
+                target, messageSinkManager, eventBus, urlBuilder), args.getArgumentsAsString());
     }
 
     @Override

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -36,6 +36,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -63,6 +65,7 @@ public class RedirectCommandTest {
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private WindowManager windowManager;
     @Mock private URLBuilder urlBuilder;
+    @Mock private EventBus eventBus;
 
     @Before
     public void setup() {
@@ -89,7 +92,7 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
-                urlBuilder);
+                urlBuilder, eventBus);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));