Migrate to query events not actions.

Change-Id: I9a8817842167ae56f845987c5d345122667314df
Reviewed-on: http://gerrit.dmdirc.com/3460
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Query.java

@@ -23,9 +23,16 @@
 package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
+import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.events.QueryActionEvent;
+import com.dmdirc.events.QueryClosedEvent;
+import com.dmdirc.events.QueryMessageEvent;
+import com.dmdirc.events.QueryNickchangeEvent;
+import com.dmdirc.events.QueryQuitEvent;
+import com.dmdirc.events.QuerySelfActionEvent;
+import com.dmdirc.events.QuerySelfMessageEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.PrivateChat;
@@ -69,6 +76,8 @@ 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. */
@@ -107,6 +116,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
 
+        this.eventBus = eventBus;
         this.server = newServer;
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
@@ -135,8 +145,10 @@ public class Query extends MessageTarget implements PrivateActionListener,
                 server.getParser().sendMessage(target, part);
 
                 doNotification("querySelfMessage", server.getParser().getLocalClient(), part);
-                triggerAction("querySelfMessage", CoreActionType.QUERY_SELF_MESSAGE,
-                        server.getParser().getLocalClient(), part);
+                final DisplayableEvent event = new QuerySelfMessageEvent(this, server.getParser().
+                        getLocalClient(), part);
+                event.setDisplayFormat("querySelfMessage");
+                eventBus.post(event);
             }
         }
     }
@@ -174,7 +186,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
             server.getParser().sendAction(getNickname(), action);
 
             doNotification("querySelfAction", client, action);
-            triggerAction("querySelfAction", CoreActionType.QUERY_SELF_ACTION, client, action);
+            final DisplayableEvent event = new QuerySelfActionEvent(this, client, action);
+            event.setDisplayFormat("querySelfAction");
+            eventBus.post(event);
         } else {
             addLine("actionTooLong", action.length());
         }
@@ -187,9 +201,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final StringBuffer buff = new StringBuffer("queryMessage");
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.QUERY_MESSAGE, buff, this,
-                parser.getClient(host), message);
+        final DisplayableEvent event = new QueryMessageEvent(this, parser.getClient(host), message);
+        event.setDisplayFormat(buff.toString());
+        eventBus.post(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -201,9 +215,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final StringBuffer buff = new StringBuffer("queryAction");
 
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.QUERY_ACTION, buff, this, parser.getClient(host),
-                message);
+        final DisplayableEvent event = new QueryActionEvent(this, parser.getClient(host), message);
+        event.setDisplayFormat(buff.toString());
+        eventBus.post(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -255,8 +269,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final StringBuffer format = new StringBuffer("queryNickChanged");
 
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.QUERY_NICKCHANGE, format, this, oldNick);
+            final DisplayableEvent event = new QueryNickchangeEvent(this, oldNick);
+            event.setDisplayFormat("queryNickChanged");
+            eventBus.post(event);
 
             server.updateQuery(this, oldNick, client.getNickname());
 
@@ -277,8 +292,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final StringBuffer format = new StringBuffer(reason.isEmpty()
                     ? "queryQuit" : "queryQuitReason");
 
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.QUERY_QUIT, format, this, reason);
+            final DisplayableEvent event = new QueryQuitEvent(this, reason);
+            event.setDisplayFormat(format.toString());
+            eventBus.post(event);
 
             addLine(format, client.getNickname(),
                     client.getUsername(), client.getHostname(), reason);
@@ -310,8 +326,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
 
         // Trigger action for the window closing
-        ActionManager.getActionManager().triggerEvent(
-                CoreActionType.QUERY_CLOSED, null, this);
+        eventBus.post(new QueryClosedEvent(this));
 
         // Inform any parents that the window is closing
         if (server != null) {

src/com/dmdirc/Server.java

@@ -28,6 +28,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
+import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
@@ -146,7 +147,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     /** Our reason for being away, if any. */
     private String awayMessage;
     /** Our event handler. */
-    private final ServerEventHandler eventHandler = new ServerEventHandler(this);
+    private final ServerEventHandler eventHandler;
     /** A list of outstanding invites. */
     private final List<Invite> invites = new ArrayList<>();
     /** A set of channels we want to join without focusing. */
@@ -257,6 +258,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         this.userSettings = userSettings;
         this.statusBarManager = statusBarManager;
 
+        eventHandler = new ServerEventHandler(this, eventBus);
+
         setConnectionDetails(uri, profile);
 
         updateIcon();
@@ -535,8 +538,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final Query newQuery = queryFactory.getQuery(this, host);
 
             windowManager.addWindow(this, newQuery, focus);
-            ActionManager.getActionManager().triggerEvent(
-                    CoreActionType.QUERY_OPENED, null, newQuery);
+            eventBus.post(new QueryOpenedEvent(newQuery));
 
             getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);

src/com/dmdirc/ServerEventHandler.java

@@ -24,6 +24,9 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.events.QuerySelfActionEvent;
+import com.dmdirc.events.QuerySelfMessageEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
@@ -68,6 +71,8 @@ import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -91,16 +96,18 @@ public class ServerEventHandler extends EventHandler implements
 
     /** The server instance that owns this event handler. */
     private final Server owner;
+    /** Event bus to post events to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of ServerEventHandler.
      *
-     * @param owner The Server instance that we're handling events for
+     * @param owner    The Server instance that we're handling events for
+     * @param eventBus The event bus to post events to
      */
-    public ServerEventHandler(final Server owner) {
-        super();
-
+    public ServerEventHandler(final Server owner, final EventBus eventBus) {
         this.owner = owner;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -338,8 +345,10 @@ public class ServerEventHandler extends EventHandler implements
             // Local client
             owner.getQuery(target).doNotification("querySelfExternalMessage",
                     parser.getLocalClient(), message);
-            triggerAction("querySelfExternalMessage", CoreActionType.QUERY_SELF_MESSAGE, parser.
-                    getLocalClient(), message);
+            final DisplayableEvent event = new QuerySelfMessageEvent(owner.getQuery(target),
+                    parser.getLocalClient(), message);
+            event.setDisplayFormat("querySelfExternalMessage");
+            eventBus.post(event);
         } else {
             owner.doNotification("unknownMessage", host, target, message);
             triggerAction("unknownMessage", CoreActionType.SERVER_UNKNOWNNOTICE, host, target,
@@ -356,7 +365,10 @@ public class ServerEventHandler extends EventHandler implements
             // Local client
             owner.getQuery(target).doNotification("querySelfExternalAction",
                     parser.getLocalClient(), message);
-            triggerAction("querySelfExternalAction", CoreActionType.QUERY_SELF_ACTION, message);
+            final DisplayableEvent event = new QuerySelfActionEvent(owner.getQuery(target),
+                    parser.getLocalClient(), message);
+            event.setDisplayFormat("querySelfExternalAction");
+            eventBus.post(event);
         } else {
             owner.doNotification("unknownAction", host, target, message);
             triggerAction("unknownAction", CoreActionType.SERVER_UNKNOWNACTION, host, target,

src/com/dmdirc/actions/CoreActionType.java

@@ -204,20 +204,28 @@ public enum CoreActionType implements ActionType {
     CHANNEL_TOPICCHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG,
             "Someone changed channel topic"),
     /** Query opened. */
+    @Deprecated
     QUERY_OPENED(QueryEvents.QUERY_EVENT, "Query window opened"),
     /** Query closed. */
+    @Deprecated
     QUERY_CLOSED(QueryEvents.QUERY_EVENT, "Query window closed"),
     /** Query message received. */
+    @Deprecated
     QUERY_MESSAGE(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private message received"),
     /** Query action received. */
+    @Deprecated
     QUERY_ACTION(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private action received"),
     /** Query message sent. */
+    @Deprecated
     QUERY_SELF_MESSAGE(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private message sent"),
     /** Query action sent. */
+    @Deprecated
     QUERY_SELF_ACTION(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private action sent"),
     /** Query quit event. */
+    @Deprecated
     QUERY_QUIT(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user quit"),
     /** Query nick change. */
+    @Deprecated
     QUERY_NICKCHANGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user changed nicks"),
     /** Plugin loaded. */
     @Deprecated

src/com/dmdirc/events/QueryActionEvent.java

@@ -23,18 +23,35 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Fired when an action occurs in a query.
  */
 public class QueryActionEvent extends QueryDisplayableEvent {
 
-    public QueryActionEvent(final long timestamp, final Query query) {
+    private final ClientInfo client;
+    private final String message;
+
+    public QueryActionEvent(final long timestamp, final Query query, final ClientInfo client,
+            final String message) {
         super(timestamp, query);
+        this.client = client;
+        this.message = message;
     }
 
-    public QueryActionEvent(final Query query) {
+    public QueryActionEvent(final Query query, final ClientInfo client, final String message) {
         super(query);
+        this.client = client;
+        this.message = message;
+    }
+
+    public ClientInfo getClient() {
+        return client;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 }

src/com/dmdirc/events/QueryMessageEvent.java

@@ -23,18 +23,35 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Fired when a message occurs in a query.
  */
 public class QueryMessageEvent extends QueryDisplayableEvent {
 
-    public QueryMessageEvent(final long timestamp, final Query query) {
+    private final ClientInfo client;
+    private final String message;
+
+    public QueryMessageEvent(final long timestamp, final Query query, final ClientInfo client,
+            final String message) {
         super(timestamp, query);
+        this.client = client;
+        this.message = message;
     }
 
-    public QueryMessageEvent(final Query query) {
+    public QueryMessageEvent(final Query query, final ClientInfo client, final String message) {
         super(query);
+        this.client = client;
+        this.message = message;
+    }
+
+    public ClientInfo getClient() {
+        return client;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 }

src/com/dmdirc/events/QueryNickchangeEvent.java

@@ -29,12 +29,20 @@ import com.dmdirc.Query;
  */
 public class QueryNickchangeEvent extends QueryDisplayableEvent {
 
-    public QueryNickchangeEvent(final long timestamp, final Query query) {
+    private final String oldNick;
+
+    public QueryNickchangeEvent(final long timestamp, final Query query, final String oldNick) {
         super(timestamp, query);
+        this.oldNick = oldNick;
     }
 
-    public QueryNickchangeEvent(final Query query) {
+    public QueryNickchangeEvent(final Query query, final String oldNick) {
         super(query);
+        this.oldNick = oldNick;
+    }
+
+    public String getOldNick() {
+        return oldNick;
     }
 
 }

src/com/dmdirc/events/QueryQuitEvent.java

@@ -29,12 +29,20 @@ import com.dmdirc.Query;
  */
 public class QueryQuitEvent extends QueryDisplayableEvent {
 
-    public QueryQuitEvent(final long timestamp, final Query query) {
+    private final String reason;
+
+    public QueryQuitEvent(final long timestamp, final Query query, final String reason) {
         super(timestamp, query);
+        this.reason = reason;
     }
 
-    public QueryQuitEvent(final Query query) {
+    public QueryQuitEvent(final Query query, final String reason) {
         super(query);
+        this.reason = reason;
+    }
+
+    public String getReason() {
+        return reason;
     }
 
 }

src/com/dmdirc/events/QuerySelfActionEvent.java

@@ -23,18 +23,35 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Fired when a self action is sent in query.
  */
 public class QuerySelfActionEvent extends QueryDisplayableEvent {
 
-    public QuerySelfActionEvent(final long timestamp, final Query query) {
+    private final ClientInfo client;
+    private final String message;
+
+    public QuerySelfActionEvent(final long timestamp, final Query query, final ClientInfo client,
+            final String message) {
         super(timestamp, query);
+        this.client = client;
+        this.message = message;
     }
 
-    public QuerySelfActionEvent(final Query query) {
+    public QuerySelfActionEvent(final Query query, final ClientInfo client, final String message) {
         super(query);
+        this.client = client;
+        this.message = message;
+    }
+
+    public ClientInfo getClient() {
+        return client;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 }

src/com/dmdirc/events/QuerySelfMessage.java → src/com/dmdirc/events/QuerySelfMessageEvent.java

@@ -23,18 +23,35 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Fired when a self message happens in a query.
  */
-public class QuerySelfMessage extends QueryDisplayableEvent {
+public class QuerySelfMessageEvent extends QueryDisplayableEvent {
 
-    public QuerySelfMessage(final long timestamp, final Query query) {
+    private final ClientInfo client;
+    private final String message;
+
+    public QuerySelfMessageEvent(final long timestamp, final Query query, final ClientInfo client,
+            final String message) {
         super(timestamp, query);
+        this.client = client;
+        this.message = message;
     }
 
-    public QuerySelfMessage(final Query query) {
+    public QuerySelfMessageEvent(final Query query, final ClientInfo client, final String message) {
         super(query);
+        this.client = client;
+        this.message = message;
+    }
+
+    public ClientInfo getClient() {
+        return client;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 }