Rewrite the entire UI to pass extra deps in.

Conflicts:
        src/com/dmdirc/addons/ui_swing/components/TopicBar.java
        src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java
        src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java
        src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

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

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
 import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
      * @param colourManager The colour manager to use for colour input.
      * @param pluginManager The plugin manager to use for plugin information.
      * @param clipboard     The clipboard to copy and paste from
+     * @param commandController The controller to use for command information.
      * @param channel       The channel that this topic bar is for.
      * @param window        The window this topic bar is for.
      * @param iconManager   The icon manager to use for this bar's icons.
             final ColourManager colourManager,
             final PluginManager pluginManager,
             final Clipboard clipboard,
+            final CommandController commandController,
             @Unbound final Channel channel,
             @Unbound final ChannelFrame window,
             @Unbound final IconManager iconManager) {
                 iconManager.getIcon("close-active"));
 
         final SwingInputHandler handler = new SwingInputHandler(
-                pluginManager, topicText, channel.getCommandParser(), channel);
+                pluginManager, topicText, commandController, channel.getCommandParser(),
+                channel, channel.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.messages.ColourManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.Toolkit;
     private final PasteDialogFactory pasteDialogFactory;
     /** Clipboard to use for copying and pasting. */
     private final Clipboard clipboard;
+    /** The controller to use to retrieve command information. */
+    private final CommandController commandController;
+    /** The bus to despatch input events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of InputFrame.
         this.pluginManager = deps.pluginManager;
         this.pasteDialogFactory = deps.pasteDialog;
         this.clipboard = deps.clipboard;
+        this.commandController = deps.commandController;
+        this.eventBus = deps.eventBus;
 
         initComponents(inputFieldProvider);
 
      */
     private void initComponents(final Provider<SwingInputField> inputFieldProvider) {
         inputField = inputFieldProvider.get();
-        inputHandler = new SwingInputHandler(pluginManager, inputField,
-                getContainer().getCommandParser(), getContainer());
+        inputHandler = new SwingInputHandler(pluginManager, inputField, commandController,
+                getContainer().getCommandParser(), getContainer(), eventBus);
         inputHandler.addValidationListener(inputField);
         inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).
                 getTabCompleter());

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

 import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
         final IconManager iconManager;
         final ActiveFrameManager activeFrameManager;
         final Clipboard clipboard;
+        final CommandController commandController;
 
         @Inject
         public TextFrameDependencies(
                 @GlobalConfig final IconManager iconManager,
                 @GlobalConfig final AggregateConfigProvider globalConfig,
                 final ActiveFrameManager activeFrameManager,
-                final Clipboard clipboard) {
+                final Clipboard clipboard,
+                final CommandController commandController) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainFrame = mainFrame;
             this.iconManager = iconManager;
             this.activeFrameManager = activeFrameManager;
             this.clipboard = clipboard;
+            this.commandController = commandController;
         }
 
     }

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
      *
-     * @param serviceManager Manager to use to look up tab completion services.
-     * @param target         The text field this input handler is dealing with.
-     * @param commandParser  The command parser to use for this text field.
-     * @param parentWindow   The window that owns this input handler
+     * @param serviceManager    Manager to use to look up tab completion services.
+     * @param target            The text field this input handler is dealing with.
+     * @param commandController The controller to use to retrieve command information.
+     * @param commandParser     The command parser to use for this text field.
+     * @param parentWindow      The window that owns this input handler
+     * @param eventBus          The event bus to use to despatch input events.
      */
     public SwingInputHandler(
             final ServiceManager serviceManager,
             final InputField target,
+            final CommandController commandController,
             final CommandParser commandParser,
-            final WritableFrameContainer parentWindow) {
-        super(serviceManager, target, commandParser, parentWindow);
+            final WritableFrameContainer parentWindow,
+            final EventBus eventBus) {
+        super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
     private final PrefsComponentFactory compFactory;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
+    /** The controller to use to retrieve command information. */
+    private final CommandController commandController;
 
     /**
      * Creates a new instance of ChannelSettingsDialog.
      * @param channel            The channel object that we're editing settings for
      * @param parentWindow       Parent window
      * @param clipboard          Clipboard to copy and paste from
+     * @param commandController  The controller to use to retrieve command information.
      */
     public ChannelSettingsDialog(
             final IdentityFactory identityFactory,
             final PrefsComponentFactory compFactory,
             final Channel channel,
             final MainFrame parentWindow,
-            final Clipboard clipboard) {
+            final Clipboard clipboard,
+            final CommandController commandController) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.userConfig = checkNotNull(userConfig);
         this.compFactory = checkNotNull(compFactory);
         this.channel = checkNotNull(channel);
         this.clipboard = clipboard;
+        this.commandController = checkNotNull(commandController);
 
         this.identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
                 channel.getChannelInfo().getName());
 
     /** Initialises the Topic tab. */
     private void initTopicTab() {
-        topicModesPane = new TopicPane(channel, channel.getIconManager(), serviceManager,
+        topicModesPane = new TopicPane(channel, channel.getIconManager(),
+                commandController, serviceManager,
                 this, channelWindow, clipboard);
         tabbedPane.addTab("Topic", topicModesPane);
     }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
      * @param parent         Parent channel settings dialog
      * @param channelWindow  Channel window
      * @param clipboard      Clipboard to copy and paste
+     * @param commandController The controller to use to retrieve command information.
      */
     public TopicDisplayPane(final Channel channel, final IconManager iconManager,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
-            final InputWindow channelWindow, final Clipboard clipboard) {
+            final InputWindow channelWindow, final Clipboard clipboard,
+            final CommandController commandController) {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;
         topicLengthMax = channel.getConnection().getParser().getMaxTopicLength();
         this.channelWindow = channelWindow;
 
-        initComponents(iconManager, channel.getConfigManager(), serviceManager);
+        initComponents(iconManager, channel.getConfigManager(), serviceManager, commandController);
         addListeners();
         layoutComponents();
 
         setTopic(channel.getCurrentTopic());
     }
 
-    /** Initialises the components. */
-    private void initComponents(final IconManager iconManager,
-            final AggregateConfigProvider config, final ServiceManager serviceManager) {
+    private void initComponents(
+            final IconManager iconManager,
+            final AggregateConfigProvider config,
+            final ServiceManager serviceManager,
+            final CommandController commandController) {
         topicLengthLabel = new JLabel();
         topicText = new TextAreaInputField(iconManager, config, 100, 4);
         topicWho = new TextLabel();
         topicText.setRows(5);
         topicText.setColumns(30);
         final SwingInputHandler handler = new SwingInputHandler(serviceManager, topicText,
-                channel.getCommandParser(), channelWindow.getContainer());
+                commandController, channel.getCommandParser(), channelWindow.getContainer(),
+                channel.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

 
 import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
      *
      * @param channel        Parent channel
      * @param iconManager    Icon manager
+     * @param commandController The controller to use to retrieve command information.
      * @param serviceManager Service manager
      * @param parent         Parent dialog
      * @param channelWindow  Channel window
      * @param clipboard      Clipboard to copy and paste with
      */
     public TopicPane(final Channel channel, final IconManager iconManager,
+            final CommandController commandController,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard) {
         super();
         this.channelWindow = channelWindow;
         this.clipboard = clipboard;
 
-        update(iconManager, serviceManager);
-    }
-
-    /** Updates the panel. */
-    private void update(final IconManager iconManager, final ServiceManager serviceManager) {
         setVisible(false);
 
         removeAll();
-        initTopicsPanel(iconManager, serviceManager);
+        initTopicsPanel(iconManager, serviceManager, commandController);
         layoutComponents();
 
         topicHistoryPane.addActionListener(this);
         setVisible(true);
     }
 
-    /** Initialises the topic panel. */
-    private void initTopicsPanel(final IconManager iconManager,
-            final ServiceManager serviceManager) {
+    private void initTopicsPanel(
+            final IconManager iconManager,
+            final ServiceManager serviceManager,
+            final CommandController commandController) {
         topicDisplayPane = new TopicDisplayPane(channel, iconManager, serviceManager, parent,
-                channelWindow, clipboard);
+                channelWindow, clipboard, commandController);
         topicHistoryPane = new TopicHistoryPane(channel);
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
     private final PluginManager pluginManager;
     /** Config to read settings from. */
     private final AggregateConfigProvider config;
+    /** The controller to use to retrieve command information. */
+    private final CommandController commandController;
+    /** The bus to despatch events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PreferencesDialog.
      *
-     * @param iconManager   Icon manager to retrieve icons with
-     * @param config        Config to read settings from
-     * @param pluginManager to retrieve tab completers with
-     * @param newParent     The frame that owns this dialog
-     * @param text          text to show in the paste dialog
-     * @param parentWindow  Parent window
+     * @param iconManager       Icon manager to retrieve icons with
+     * @param config            Config to read settings from
+     * @param pluginManager     to retrieve tab completers with
+     * @param commandController The controller to use to retrieve command information.
+     * @param eventBus          The bus to despatch events on.
+     * @param newParent         The frame that owns this dialog
+     * @param text              text to show in the paste dialog
+     * @param parentWindow      Parent window
      */
     public PasteDialog(
             @SuppressWarnings("qualifiers") @GlobalConfig final IconManager iconManager,
             @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider config,
             final PluginManager pluginManager,
+            final CommandController commandController,
+            final EventBus eventBus,
             @Unbound final InputTextFrame newParent,
             @Unbound final String text,
             @Unbound final Window parentWindow) {
         this.iconManager = iconManager;
         this.config = config;
         this.pluginManager = pluginManager;
+        this.commandController = commandController;
+        this.eventBus = eventBus;
 
         initComponents(text);
         initListeners();
         textField.setColumns(50);
         textField.setRows(10);
 
-        new SwingInputHandler(pluginManager, textField, parent.getContainer().getCommandParser(),
-                parent.getContainer()).setTypes(false, false, true, false);
+        new SwingInputHandler(pluginManager, textField, commandController,
+                parent.getContainer().getCommandParser(),
+                parent.getContainer(), eventBus).setTypes(false, false, true, false);
 
         scrollPane.setViewportView(textField);
         scrollPane.setVisible(false);

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

 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final MainFrame parentWindow,
-            final Clipboard clipboard) {
+            final Clipboard clipboard,
+            final CommandController commandController) {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
                         userConfig, serviceManager, preferencesManager,
-                        compFactory, key, parentWindow, clipboard);
+                        compFactory, key, parentWindow, clipboard, commandController);
             }
         };
     }

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

 
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 import org.mortbay.jetty.Handler;
     private final DynamicRequestHandler handler;
     /** The plugin manager used to find other plugins. */
     private final PluginManager pluginManager;
+    /** The controller to use to retrieve command information. */
+    private final CommandController commandController;
+    /** The bus to despatch events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
      *
      * @param domain               The domain to retrieve config settings from
      * @param identityController   The controller to read/write settings with.
+     * @param commandController    The controller to use to retrieve command information.
+     * @param eventBus             The bus to despatch events on.
      * @param serverManager        The manager to use to find and create servers
      * @param pluginManager        The manager to use to find other plugins
      * @param coreWindowManager    Window management
     public WebInterfaceUI(
             @PluginDomain(WebInterfacePlugin.class) final String domain,
             final IdentityController identityController,
+            final CommandController commandController,
+            final EventBus eventBus,
             final ServerManager serverManager,
             final PluginManager pluginManager,
             final WindowManager coreWindowManager,
         super();
 
         this.pluginManager = pluginManager;
+        this.commandController = commandController;
+        this.eventBus = eventBus;
 
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
         return pluginManager;
     }
 
+    public CommandController getCommandController() {
+        return commandController;
+    }
+
+    public EventBus getEventBus() {
+        return eventBus;
+    }
+
     /**
      * Adds the specified handler to the webserver.
      *

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleter;
 
+import com.google.common.eventbus.EventBus;
+
 /**
  * An input handler for the web ui.
  */
 
     public WebInputHandler(
             final ServiceManager serviceManager,
-            final InputField thisTarget,
-            final CommandParser thisCommandParser,
-            final WritableFrameContainer thisParentWindow) {
-        super(serviceManager, thisTarget, thisCommandParser, thisParentWindow);
+            final InputField target,
+            final CommandController commandController,
+            final CommandParser commandParser,
+            final WritableFrameContainer parentWindow,
+            final EventBus eventBus) {
+        super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
     }
 
     public InputField getTarget() {

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

         this.commandparser = parent.getCommandParser();
         this.controller = controller;
         this.inputHandler = new WebInputHandler(controller.getPluginManager(),
-                new WebInputField(), commandparser, getContainer());
+                new WebInputField(), controller.getCommandController(),
+                commandparser, getContainer(), controller.getEventBus());
     }
 
+    @Override
     public WritableFrameContainer getContainer() {
         return container;
     }
         if (!inputHandlers.containsKey(client)) {
             final WebInputHandler ih = new WebInputHandler(
                     controller.getPluginManager(), new WebInputField(client),
-                    commandparser, getContainer());
+                    controller.getCommandController(),
+                    commandparser, getContainer(), controller.getEventBus());
             ih.setTabCompleter(inputHandler.getTabCompleter());
             inputHandlers.put(client, ih);
         }