Use some more events.

Remove some deprecated methods in ChannelFrame.

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

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -35,6 +35,8 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
+import com.dmdirc.events.ClientFocusGainedEvent;
+import com.dmdirc.events.ClientFocusLostEvent;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.NotificationListener;
@@ -49,6 +51,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.WindowEvent;
@@ -139,6 +143,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * @param quitWorker          The quit worker to use when quitting the app.
      * @param iconManager         The icon manager to use to get icons.
      * @param windowManager       Window management
+     * @param eventBus            The event bus to post events to.
      */
     public MainFrame(
             final Apple apple,
@@ -148,7 +153,8 @@ public class MainFrame extends JFrame implements WindowListener,
             final AggregateConfigProvider globalConfig,
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final EventBus eventBus) {
         super();
 
         this.apple = apple;
@@ -181,15 +187,13 @@ public class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void windowGainedFocus(final WindowEvent e) {
-                ActionManager.getActionManager().triggerEvent(
-                        CoreActionType.CLIENT_FOCUS_GAINED, null);
+                eventBus.post(new ClientFocusGainedEvent());
             }
 
             /** {@inheritDoc} */
             @Override
             public void windowLostFocus(final WindowEvent e) {
-                ActionManager.getActionManager().triggerEvent(
-                        CoreActionType.CLIENT_FOCUS_LOST, null);
+                eventBus.post(new ClientFocusLostEvent());
             }
         });
 

src/com/dmdirc/addons/ui_swing/QuitWorker.java

@@ -23,12 +23,13 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ServerManager;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.ClientClosingEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 import javax.swing.SwingWorker;
 
@@ -45,6 +46,8 @@ public class QuitWorker extends SwingWorker<Void, Void> {
     private final ServerManager serverManager;
     /** The main frame to interact with. */
     private final MainFrame mainFrame;
+    /** Bus to despatch events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new {@link QuitWorker}.
@@ -52,23 +55,25 @@ public class QuitWorker extends SwingWorker<Void, Void> {
      * @param identityController The identity controller to use to read/write settings.
      * @param serverManager      The server manager to use to disconnect all servers.
      * @param mainFrame          The main frame to interact with.
+     * @param eventBus           Bus to despatch events on.
      */
     @Inject
     public QuitWorker(
             final IdentityController identityController,
             final ServerManager serverManager,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            final EventBus eventBus) {
         this.globalIdentity = identityController.getUserSettings();
         this.globalConfig = identityController.getGlobalConfiguration();
         this.serverManager = serverManager;
         this.mainFrame = mainFrame;
+        this.eventBus = eventBus;
     }
 
     /** {@inheritDoc} */
     @Override
     protected Void doInBackground() {
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.CLIENT_CLOSING, null);
+        eventBus.post(new ClientClosingEvent());
         serverManager.closeAll(globalConfig.getOption("general", "closemessage"));
         globalIdentity.setOption("ui", "frameManagerSize",
                 String.valueOf(mainFrame.getFrameManagerSize()));

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

@@ -25,8 +25,6 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
@@ -34,12 +32,16 @@ import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
 import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.events.ClientClosingEvent;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -54,8 +56,7 @@ import net.miginfocom.swing.MigLayout;
  * The channel frame is the GUI component that represents a channel to the user.
  */
 @Factory(inject = true, singleton = true, providers = true)
-public final class ChannelFrame extends InputTextFrame implements ActionListener,
-        com.dmdirc.interfaces.ActionListener {
+public final class ChannelFrame extends InputTextFrame implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class structure is changed
@@ -75,6 +76,10 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     private TopicBar topicBar;
     /** UI controller. */
     private final SwingController controller;
+    /** Event bus to despatch events on. */
+    private final EventBus eventBus;
+    /** Config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
 
     /**
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers, and default options
@@ -91,16 +96,16 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
             final TopicBarFactory topicBarFactory,
             @Unbound final Channel owner) {
         super(deps, owner);
-        this.controller = getController();
+
+        this.controller = deps.controller;
+        this.eventBus = deps.eventBus;
+        this.globalConfig = deps.globalConfig;
 
         initComponents(topicBarFactory);
 
-        controller.getGlobalConfig().addChangeListener("ui",
-                "channelSplitPanePosition", this);
-        controller.getGlobalConfig().addChangeListener(
-                controller.getDomain(), "shownicklist", this);
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.CLIENT_CLOSING);
+        globalConfig.addChangeListener("ui", "channelSplitPanePosition", this);
+        globalConfig.addChangeListener(controller.getDomain(), "shownicklist", this);
+        eventBus.register(this);
 
         identity = identityFactory.createChannelConfig(owner.getConnection().getNetwork(),
                 owner.getChannelInfo().getName());
@@ -137,8 +142,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         settingsMI = new JMenuItem("Settings");
         settingsMI.addActionListener(this);
 
-        splitPane = new SplitPane(controller.getGlobalConfig(),
-                SplitPane.Orientation.HORIZONTAL);
+        splitPane = new SplitPane(globalConfig, SplitPane.Orientation.HORIZONTAL);
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3, wrap 1"));
 
@@ -148,8 +152,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         add(inputPanel, "growx");
 
         splitPane.setLeftComponent(getTextPane());
-        if (getContainer().getConfigManager().getOptionBool(getController()
-                .getDomain(), "shownicklist")) {
+        if (getContainer().getConfigManager().getOptionBool(
+                controller.getDomain(), "shownicklist")) {
             splitPane.setRightComponent(nicklist);
         } else {
             splitPane.setRightComponent(null);
@@ -166,7 +170,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            getController().showChannelSettingsDialog((Channel) getContainer());
+            controller.showChannelSettingsDialog((Channel) getContainer());
         }
     }
 
@@ -179,7 +183,6 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         return splitPane;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
@@ -199,8 +202,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
             });
         }
         if ("shownicklist".equals(key)) {
-            if (getContainer().getConfigManager().getOptionBool(getController()
-                    .getDomain(), "shownicklist")) {
+            if (getContainer().getConfigManager()
+                    .getOptionBool(controller.getDomain(), "shownicklist")) {
                 splitPane.setRightComponent(nicklist);
             } else {
                 splitPane.setRightComponent(null);
@@ -208,10 +211,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
+    @Subscribe
+    public void handleClientClosing(final ClientClosingEvent event) {
         saveSplitPanePosition();
     }
 
@@ -279,8 +280,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /** {@inheritDoc} */
     @Override
     public void dispose() {
-        ActionManager.getActionManager().unregisterListener(this);
-        controller.getGlobalConfig().removeListener(this);
+        eventBus.unregister(this);
+        globalConfig.removeListener(this);
         super.dispose();
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -63,6 +64,8 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Point;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -256,26 +259,26 @@ public abstract class TextFrame extends JPanel implements Window,
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0),
-                "pageUpAction");
+                        "pageUpAction");
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0),
-                "pageDownAction");
+                        "pageDownAction");
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0), "searchAction");
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_F,
-                UIUtilities.getCtrlDownMask()), "searchAction");
+                                UIUtilities.getCtrlDownMask()), "searchAction");
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_HOME,
-                UIUtilities.getCtrlDownMask()), "homeAction");
+                                UIUtilities.getCtrlDownMask()), "homeAction");
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_END,
-                UIUtilities.getCtrlDownMask()), "endAction");
+                                UIUtilities.getCtrlDownMask()), "endAction");
 
         getSearchBar().getTextField().getInputMap().put(KeyStroke.getKeyStroke(
                 KeyEvent.VK_C, UIUtilities.getCtrlMask()), "textpaneCopy");
@@ -284,7 +287,7 @@ public abstract class TextFrame extends JPanel implements Window,
                 & KeyEvent.SHIFT_DOWN_MASK), "textpaneCopy");
         getSearchBar().getTextField().getActionMap().put("textpaneCopy",
                 new InputFieldCopyAction(getTextPane(),
-                getSearchBar().getTextField()));
+                        getSearchBar().getTextField()));
 
         getActionMap().put("pageUpAction",
                 new TextPanePageUpAction(getTextPane()));
@@ -352,8 +355,8 @@ public abstract class TextFrame extends JPanel implements Window,
             case CHANNEL:
                 if (frameParent.getConnection() != null && ActionManager
                         .getActionManager().triggerEvent(
-                        CoreActionType.LINK_CHANNEL_CLICKED, null, this,
-                        clickType.getValue())) {
+                                CoreActionType.LINK_CHANNEL_CLICKED, null, this,
+                                clickType.getValue())) {
                     frameParent.getConnection().join(
                             new ChannelJoinRequest(clickType.getValue()));
                 }
@@ -368,11 +371,11 @@ public abstract class TextFrame extends JPanel implements Window,
             case NICKNAME:
                 if (frameParent.getConnection() != null && ActionManager
                         .getActionManager().triggerEvent(
-                        CoreActionType.LINK_NICKNAME_CLICKED, null, this,
-                        clickType.getValue())) {
+                                CoreActionType.LINK_NICKNAME_CLICKED, null, this,
+                                clickType.getValue())) {
                     getController().requestWindowFocus(getController()
                             .getWindowFactory().getSwingWindow(getContainer()
-                            .getConnection().getQuery(clickType.getValue())));
+                                    .getConnection().getQuery(clickType.getValue())));
                 }
                 break;
             default:
@@ -582,12 +585,12 @@ public abstract class TextFrame extends JPanel implements Window,
         final ColourManager colourManager = new ColourManager(getContainer().getConfigManager());
         getTextPane().setForeground(UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                getContainer().getConfigManager().getOptionString(
-                "ui", "foregroundcolour"), null)));
+                        getContainer().getConfigManager().getOptionString(
+                                "ui", "foregroundcolour"), null)));
         getTextPane().setBackground(UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                getContainer().getConfigManager().getOptionString(
-                "ui", "backgroundcolour"), null)));
+                        getContainer().getConfigManager().getOptionString(
+                                "ui", "backgroundcolour"), null)));
     }
 
     /** Disposes of this window, removing any listeners. */
@@ -599,18 +602,20 @@ public abstract class TextFrame extends JPanel implements Window,
     /**
      * Bundle of dependencies required by {@link TextFrame}.
      *
-     * <p>Because of the number of dependencies and the amount of subclassing, collect the
-     * dependencies together here so they can be easily modified without having to modify all
-     * subclasses.
+     * <p>
+     * Because of the number of dependencies and the amount of subclassing, collect the dependencies
+     * together here so they can be easily modified without having to modify all subclasses.
      */
     public static class TextFrameDependencies {
 
-        private final TextPaneFactory textPaneFactory;
-        private final SwingController controller;
-        private final Provider<MainFrame> mainFrame;
-        private final PopupManager popupManager;
-        private final URLHandler urlHandler;
-        private final CommandController commandController;
+        final TextPaneFactory textPaneFactory;
+        final SwingController controller;
+        final Provider<MainFrame> mainFrame;
+        final PopupManager popupManager;
+        final URLHandler urlHandler;
+        final CommandController commandController;
+        final EventBus eventBus;
+        final AggregateConfigProvider globalConfig;
 
         @Inject
         public TextFrameDependencies(
@@ -619,13 +624,17 @@ public abstract class TextFrame extends JPanel implements Window,
                 final Provider<MainFrame> mainFrame,
                 final PopupManager popupManager,
                 final URLHandler urlHandler,
-                final CommandController commandController) {
+                final CommandController commandController,
+                final EventBus eventBus,
+                @GlobalConfig final AggregateConfigProvider globalConfig) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainFrame = mainFrame;
             this.popupManager = popupManager;
             this.urlHandler = urlHandler;
             this.commandController = commandController;
+            this.eventBus = eventBus;
+            this.globalConfig = globalConfig;
         }
 
     }

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

@@ -55,6 +55,8 @@ import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.concurrent.Callable;
 
 import javax.inject.Provider;
@@ -84,53 +86,22 @@ public class SwingModule {
     /** The domain for plugin settings. */
     private final String domain;
 
-    /**
-     * Creates a new instance of {@link SwingModule}.
-     *
-     * @param controller The controller to return. This should be removed when SwingController is
-     *                   separated from the plugin implementation.
-     * @param domain     The domain for plugin settings.
-     */
     public SwingModule(final SwingController controller, final String domain) {
         this.controller = controller;
         this.domain = domain;
     }
 
-    /**
-     * Provides the domain that the swing settings should be stored under.
-     *
-     * @return The settings domain for the swing plugin.
-     */
     @Provides
     @PluginDomain(SwingController.class)
     public String getSettingsDomain() {
         return domain;
     }
 
-    /**
-     * Gets the swing controller to use.
-     *
-     * @return The swing controller.
-     */
     @Provides
     public SwingController getController() {
         return controller;
     }
 
-    /**
-     * Gets the main DMDirc window.
-     *
-     * @param apple               Apple instance
-     * @param swingController     The controller that will own the frame.
-     * @param windowFactory       The window factory to use to create and listen for windows.
-     * @param lifecycleController The controller to use to quit the application.
-     * @param globalConfig        The config to read settings from.
-     * @param quitWorker          The worker to use when quitting the application.
-     * @param urlBuilder          The URL builder to use to find icons.
-     * @param windowManager       The core window manager to use to find windows.
-     *
-     * @return The main window.
-     */
     @Provides
     @Singleton
     public MainFrame getMainFrame(
@@ -141,7 +112,8 @@ public class SwingModule {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final EventBus eventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
             /** {@inheritDoc} */
             @Override
@@ -154,21 +126,12 @@ public class SwingModule {
                         globalConfig,
                         quitWorker,
                         new IconManager(globalConfig, urlBuilder),
-                        windowManager);
+                        windowManager,
+                        eventBus);
             }
         });
     }
 
-    /**
-     * Provides an URL handler for use in the swing UI.
-     *
-     * @param swingController  The controller that will own the handler.
-     * @param globalConfig     The global configuration to read settings from.
-     * @param serverManager    The server manager to use to connect to servers.
-     * @param statusBarManager The status bar manager to add messages to.
-     *
-     * @return The URL handler to use.
-     */
     @Provides
     @Singleton
     public URLHandler getURLHandler(

src/com/dmdirc/addons/windowflashing/WindowFlashingManager.java

@@ -23,15 +23,15 @@
 package com.dmdirc.addons.windowflashing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.events.ClientFocusGainedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import javax.inject.Inject;
 
 import com.sun.jna.Native;
@@ -41,12 +41,12 @@ import com.sun.jna.platform.win32.User32;
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.platform.win32.WinUser;
 
-public class WindowFlashingManager implements ActionListener {
+public class WindowFlashingManager {
 
     /** Swing main frame. */
     private final MainFrame mainFrame;
-    /** Action controller. */
-    private final ActionController actionController;
+    /** Event bus. */
+    private final EventBus eventBus;
     /** Config binder. */
     private final ConfigBinder binder;
     /** Cached blink rate setting. */
@@ -67,21 +67,23 @@ public class WindowFlashingManager implements ActionListener {
     private User32 user32;
 
     @Inject
-    public WindowFlashingManager(@GlobalConfig final AggregateConfigProvider config,
-            final MainFrame mainFrame, final ActionController actionController) {
+    public WindowFlashingManager(
+            @GlobalConfig final AggregateConfigProvider config,
+            final MainFrame mainFrame,
+            final EventBus eventBus) {
         this.mainFrame = mainFrame;
-        this.actionController = actionController;
+        this.eventBus = eventBus;
         binder = config.getBinder();
     }
 
     public void onLoad() {
         user32 = (User32) Native.loadLibrary("user32", User32.class);
         binder.bind(this, WindowFlashing.class);
-        actionController.registerListener(this, CoreActionType.CLIENT_FOCUS_GAINED);
+        eventBus.register(this);
     }
 
     public void onUnload() {
-        actionController.unregisterListener(this);
+        eventBus.unregister(this);
         binder.unbind(this);
         user32 = null;
         NativeLibrary.getInstance("user32").dispose();
@@ -155,9 +157,8 @@ public class WindowFlashingManager implements ActionListener {
         return returnValue;
     }
 
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
+    @Subscribe
+    public void handleFocusGained(final ClientFocusGainedEvent event) {
         if (mainFrame != null) {
             user32.FlashWindowEx(stopFlashObject());
         }