Fix breaking the client actions

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

src/com/dmdirc/ChannelEventHandler.java

@@ -55,7 +55,10 @@ import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
 
 import com.google.common.eventbus.EventBus;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Handles events for channel objects.
@@ -127,7 +130,7 @@ public class ChannelEventHandler extends EventHandler implements
         checkParser(parser);
 
         owner.setClients(channel.getChannelClients());
-        triggerAction(null, CoreActionType.CHANNEL_GOTNAMES, owner);
+        ActionManager.getActionManager().triggerEvent(CoreActionType.CHANNEL_GOTNAMES, null, owner);
     }
 
     /** {@inheritDoc} */
@@ -406,8 +409,11 @@ public class ChannelEventHandler extends EventHandler implements
 
     private boolean triggerAction(final String messageType, final ActionType actionType,
             final Object... args) {
-        final StringBuffer buffer = new StringBuffer(messageType);
-        return ActionManager.getActionManager().triggerEvent(actionType, buffer, args);
+        final List<Object> actionArgs = new ArrayList<>();
+        actionArgs.add(owner);
+        actionArgs.addAll(Arrays.asList(args));
+        return ActionManager.getActionManager().triggerEvent(actionType, new StringBuffer(
+                messageType), actionArgs.toArray());
     }
 
 }

src/com/dmdirc/Query.java

@@ -50,6 +50,7 @@ import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Toolkit;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -376,7 +377,10 @@ public class Query extends MessageTarget implements PrivateActionListener,
     private boolean triggerAction(final String messageType, final ActionType actionType,
             final Object... args) {
         final StringBuffer buffer = new StringBuffer(messageType);
-        return ActionManager.getActionManager().triggerEvent(actionType, buffer, args);
+        final List<Object> actionArgs = new ArrayList<>();
+        actionArgs.add(this);
+        actionArgs.addAll(Arrays.asList(args));
+        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.toArray());
     }
 
 }

src/com/dmdirc/ServerEventHandler.java

@@ -68,7 +68,10 @@ import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Handles parser events for a Server object.
@@ -512,7 +515,10 @@ public class ServerEventHandler extends EventHandler implements
     private boolean triggerAction(final String messageType, final ActionType actionType,
             final Object... args) {
         final StringBuffer buffer = new StringBuffer(messageType);
-        return ActionManager.getActionManager().triggerEvent(actionType, buffer, args);
+        final List<Object> actionArgs = new ArrayList<>();
+        actionArgs.add(owner);
+        actionArgs.addAll(Arrays.asList(args));
+        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.toArray());
     }
 
 }