Move more things to EventBus.

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

src/com/dmdirc/Channel.java

@@ -26,6 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
+import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.NicklistListener;
@@ -49,6 +50,8 @@ import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -88,6 +91,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     private volatile boolean showModePrefix;
     /** Whether we should show colours in nicks. */
     private volatile boolean showColours;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of Channel.
@@ -99,6 +103,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param commandController   The controller to load commands from.
      * @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 onto.
      */
     public Channel(
             @Unbound final Server newServer,
@@ -107,7 +112,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final EventBus eventBus) {
         super("channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
@@ -115,13 +121,14 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier(),
-                WindowComponent.TOPICBAR.getIdentifier(),
-                WindowComponent.USERLIST.getIdentifier()));
+                        WindowComponent.INPUTFIELD.getIdentifier(),
+                        WindowComponent.TOPICBAR.getIdentifier(),
+                        WindowComponent.USERLIST.getIdentifier()));
 
         this.configMigrator = configMigrator;
-        channelInfo = newChannelInfo;
-        server = newServer;
+        this.channelInfo = newChannelInfo;
+        this.server = newServer;
+        this.eventBus = eventBus;
 
         getConfigManager().addChangeListener("channel", this);
         getConfigManager().addChangeListener("ui", "shownickcoloursintext", this);
@@ -328,8 +335,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         }
 
         // Trigger action for the window closing
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.CHANNEL_CLOSED, null, this);
+        eventBus.post(new ChannelClosedEvent(this));
 
         // Inform any parents that the window is closing
         server.delChannel(channelInfo.getName());

src/com/dmdirc/Main.java

@@ -25,9 +25,9 @@ package com.dmdirc;
 import com.dmdirc.GlobalWindow.GlobalWindowManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ColourActionComparison;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -174,7 +174,7 @@ public class Main {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                actionManager.triggerEvent(CoreActionType.CLIENT_CLOSED, null);
+                eventBus.post(new ClientClosedEvent());
                 serverManager.disconnectAll("Unexpected shutdown");
                 identityManager.saveAll();
             }

src/com/dmdirc/Server.java

@@ -27,6 +27,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
@@ -64,6 +65,8 @@ 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.net.URI;
 import java.net.URISyntaxException;
 import java.security.cert.CertificateException;
@@ -171,6 +174,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     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. */
@@ -194,6 +199,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      * @param queryFactory        The factory to use to create queries.
      * @param rawFactory          The factory to use to create raw windows.
      * @param urlBuilder          The URL builder to use when finding icons.
+     * @param eventBus            The event bus to despatch events onto.
      * @param userSettings        The config provider to write user settings to.
      * @param uri                 The address of the server to connect to
      * @param profile             The profile to use
@@ -212,6 +218,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             final QueryFactory queryFactory,
             final RawFactory rawFactory,
             final URLBuilder urlBuilder,
+            final EventBus eventBus,
             @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider userSettings,
             @Unbound final URI uri,
             @Unbound final ConfigProvider profile) {
@@ -223,9 +230,9 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
-                WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier(),
-                WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
+                        WindowComponent.TEXTAREA.getIdentifier(),
+                        WindowComponent.INPUTFIELD.getIdentifier(),
+                        WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
         this.parserFactory = parserFactory;
@@ -235,6 +242,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         this.channelFactory = channelFactory;
         this.queryFactory = queryFactory;
         this.rawFactory = rawFactory;
+        this.eventBus = eventBus;
         this.userSettings = userSettings;
         this.statusBarManager = statusBarManager;
 
@@ -611,7 +619,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     public Channel addChannel(final ChannelInfo chan) {
         return addChannel(chan, !backgroundChannels.contains(chan.getName())
                 || getConfigManager().getOptionBool(DOMAIN_GENERAL,
-                "hidechannels"));
+                        "hidechannels"));
     }
 
     /** {@inheritDoc} */
@@ -635,8 +643,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             final Channel newChan = channelFactory.getChannel(this, chan, channelConfig);
 
             windowManager.addWindow(this, newChan, focus);
-            ActionManager.getActionManager().triggerEvent(CoreActionType.CHANNEL_OPENED, null,
-                    newChan);
+            eventBus.post(new ChannelOpenedEvent(newChan));
 
             tabCompleter.addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.put(converter.toLowerCase(chan.getName()), newChan);
@@ -1497,8 +1504,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             Logger.appError(ErrorLevel.LOW, missing.toString() + " ["
                     + parser.getServerSoftwareType() + "]",
                     new MissingModeAliasException(getNetwork(), parser,
-                    getConfigManager().getOption("identity",
-                    "modealiasversion"), missing.toString()));
+                            getConfigManager().getOption("identity",
+                                    "modealiasversion"), missing.toString()));
         }
     }
 

src/com/dmdirc/actions/ActionManager.java

@@ -26,6 +26,7 @@ import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
@@ -182,16 +183,6 @@ public class ActionManager implements ActionController {
 
         new WhoisNumericFormatter(identityManager.getAddonSettings()).register();
 
-        // Register a listener for the closing event, so we can save actions
-        registerListener(new ActionListener() {
-            /** {@inheritDoc} */
-            @Override
-            public void processEvent(final ActionType type, final StringBuffer format,
-                    final Object... arguments) {
-                saveAllActions();
-            }
-        }, CoreActionType.CLIENT_CLOSED);
-
         eventBus.register(this);
     }
 
@@ -205,6 +196,17 @@ public class ActionManager implements ActionController {
         }
     }
 
+    /**
+     * Saves all actions when the client is being closed.
+     *
+     * @param event The event that was raised.
+     */
+    @Subscribe
+    public void handleClientClosed(final ClientClosedEvent event) {
+        LOG.debug("Client closed - saving all actions");
+        saveAllActions();
+    }
+
     /** {@inheritDoc} */
     @Override
     public void registerSetting(final String name, final String value) {

src/com/dmdirc/events/ChannelClosedEvent.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.Channel;
+
+/**
+ * Event raised when a channel is closed.
+ */
+public class ChannelClosedEvent extends ChannelEvent {
+
+    public ChannelClosedEvent(final Channel channel) {
+        super(channel);
+    }
+
+}

src/com/dmdirc/events/ChannelEvent.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.Channel;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Base type for events that occur in channels.
+ */
+public abstract class ChannelEvent extends DMDircEvent {
+
+    /** The channel that this event occurred on. */
+    private final Channel channel;
+
+    public ChannelEvent(final long timestamp, final Channel channel) {
+        super(timestamp);
+        this.channel = checkNotNull(channel);
+    }
+
+    public ChannelEvent(final Channel channel) {
+        this.channel = checkNotNull(channel);
+    }
+
+    public Channel getChannel() {
+        return channel;
+    }
+
+}

src/com/dmdirc/events/ChannelOpenedEvent.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.Channel;
+
+/**
+ * Event raised when a channel is opened.
+ */
+public class ChannelOpenedEvent extends ChannelEvent {
+
+    public ChannelOpenedEvent(final Channel channel) {
+        super(channel);
+    }
+
+}

src/com/dmdirc/events/ClientClosedEvent.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+/**
+ * Fired when the client is being closed.
+ */
+public class ClientClosedEvent extends DMDircEvent {
+
+}

test/com/dmdirc/ServerTest.java

@@ -33,6 +33,8 @@ import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.net.URI;
 
 import org.junit.Before;
@@ -62,6 +64,7 @@ public class ServerTest {
     @Mock private RawFactory rawFactory;
     @Mock private StatusBarManager statusBarManager;
     @Mock private URLBuilder urlBuilder;
+    @Mock private EventBus eventBus;
 
     private Server server;
 
@@ -85,6 +88,7 @@ public class ServerTest {
                 queryFactory,
                 rawFactory,
                 urlBuilder,
+                eventBus,
                 userConfig,
                 new URI("irc-test://255.255.255.255"),
                 profile);