Remove unused parameter.

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

src/com/dmdirc/ChannelEventHandler.java

@@ -118,8 +118,7 @@ public class ChannelEventHandler extends EventHandler implements
         final StringBuffer messageType = new StringBuffer(
                 isMyself(client) ? "channelSelfExternalMessage" : "channelMessage");
         triggerAction(messageType, CoreActionType.CHANNEL_MESSAGE, client, message);
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_MESSAGE,
-                client, message);
+        owner.doNotification(date, messageType.toString(), client, message);
     }
 
     @Override
@@ -142,12 +141,11 @@ public class ChannelEventHandler extends EventHandler implements
             if (newTopic.getTopic().isEmpty()) {
                 final StringBuffer messageType = new StringBuffer("channelNoTopic");
                 triggerAction(messageType, CoreActionType.CHANNEL_NOTOPIC);
-                owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_NOTOPIC);
+                owner.doNotification(date, messageType.toString());
             } else {
                 final StringBuffer messageType = new StringBuffer("channelTopicDiscovered");
                 triggerAction(messageType, CoreActionType.CHANNEL_GOTTOPIC, newTopic);
-                owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_GOTTOPIC,
-                        newTopic);
+                owner.doNotification(date, messageType.toString(), newTopic);
             }
         } else {
             final StringBuffer messageType = new StringBuffer(
@@ -155,7 +153,6 @@ public class ChannelEventHandler extends EventHandler implements
             triggerAction(messageType, CoreActionType.CHANNEL_TOPICCHANGE,
                     channel.getChannelClient(channel.getTopicSetter(), true), channel.getTopic());
             owner.doNotification(date, messageType.toString(),
-                    CoreActionType.CHANNEL_TOPICCHANGE,
                     channel.getChannelClient(channel.getTopicSetter(), true), channel.getTopic());
         }
 
@@ -177,7 +174,7 @@ public class ChannelEventHandler extends EventHandler implements
 
         final StringBuffer messageType = new StringBuffer("channelJoin");
         triggerAction(messageType, CoreActionType.CHANNEL_JOIN, client);
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_JOIN, client);
+        owner.doNotification(date, messageType.toString(), client);
         owner.addClient(client);
     }
 
@@ -192,8 +189,7 @@ public class ChannelEventHandler extends EventHandler implements
                 + (reason.isEmpty() ? "" : "Reason"));
 
         triggerAction(messageType, CoreActionType.CHANNEL_PART, client, reason);
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_PART, client,
-                reason);
+        owner.doNotification(date, messageType.toString(), client, reason);
         owner.removeClient(client);
     }
 
@@ -207,8 +203,7 @@ public class ChannelEventHandler extends EventHandler implements
                 "channelKick" + (reason.isEmpty() ? "" : "Reason"));
         triggerAction(messageType,
                 CoreActionType.CHANNEL_KICK, client, kickedClient, reason);
-        owner.doNotification(date, messageType.toString(),
-                CoreActionType.CHANNEL_KICK, client, kickedClient, reason);
+        owner.doNotification(date, messageType.toString(), client, kickedClient, reason);
         owner.removeClient(kickedClient);
     }
 
@@ -220,8 +215,7 @@ public class ChannelEventHandler extends EventHandler implements
         final StringBuffer messageType = new StringBuffer(
                 "channelQuit" + (reason.isEmpty() ? "" : "Reason"));
         triggerAction(messageType, CoreActionType.CHANNEL_QUIT, client, reason);
-        owner.doNotification(date, messageType.toString(),
-                CoreActionType.CHANNEL_QUIT, client, reason);
+        owner.doNotification(date, messageType.toString(), client, reason);
         owner.removeClient(client);
     }
 
@@ -234,8 +228,7 @@ public class ChannelEventHandler extends EventHandler implements
         final StringBuffer messageType = new StringBuffer(
                 isMyself(client) ? "channelSelfExternalAction" : "channelAction");
         triggerAction(messageType, CoreActionType.CHANNEL_ACTION, client, message);
-        owner.doNotification(date, messageType.toString(),
-                CoreActionType.CHANNEL_ACTION, client, message);
+        owner.doNotification(date, messageType.toString(), client, message);
     }
 
     @Override
@@ -247,8 +240,7 @@ public class ChannelEventHandler extends EventHandler implements
                 isMyself(client) ? "channelSelfNickChange" : "channelNickChange");
 
         triggerAction(messageType, CoreActionType.CHANNEL_NICKCHANGE, client, oldNick);
-        owner.doNotification(date, messageType.toString(),
-                CoreActionType.CHANNEL_NICKCHANGE, client, oldNick);
+        owner.doNotification(date, messageType.toString(), client, oldNick);
         owner.renameClient(oldNick, client.getClient().getNickname());
     }
 
@@ -266,13 +258,12 @@ public class ChannelEventHandler extends EventHandler implements
                 triggerAction(messageType, CoreActionType.CHANNEL_MODESDISCOVERED,
                         modes.length() <= 1 ? "" : modes);
                 owner.doNotification(date, messageType.toString(),
-                        CoreActionType.CHANNEL_MODESDISCOVERED, modes.length() <= 1 ? "" : modes);
+                        modes.length() <= 1 ? "" : modes);
             } else {
                 final StringBuffer messageType = new StringBuffer(
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 triggerAction(messageType, CoreActionType.CHANNEL_MODECHANGE, client, modes);
-                owner.doNotification(date, messageType.toString(),
-                        CoreActionType.CHANNEL_MODECHANGE, client, modes);
+                owner.doNotification(date, messageType.toString(), client, modes);
             }
         }
 
@@ -295,9 +286,7 @@ public class ChannelEventHandler extends EventHandler implements
             final StringBuffer messageType = new StringBuffer(format);
             triggerAction(messageType, CoreActionType.CHANNEL_USERMODECHANGE, client,
                     targetClient, mode);
-            owner.doNotification(date, messageType.toString(),
-                    CoreActionType.CHANNEL_USERMODECHANGE,
-                    client, targetClient, mode);
+            owner.doNotification(date, messageType.toString(), client, targetClient, mode);
         }
     }
 
@@ -312,8 +301,7 @@ public class ChannelEventHandler extends EventHandler implements
             owner.getConnection().sendCTCPReply(client.getClient().getNickname(),
                     type, message);
         }
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_CTCP,
-                client, type, message);
+        owner.doNotification(date, messageType.toString(), client, type, message);
     }
 
     @Override
@@ -329,9 +317,7 @@ public class ChannelEventHandler extends EventHandler implements
 
             // TODO: The events should take a formatter.
             owner.doNotification(date, (away ? "channelUserAway" : "channelUserBack")
-                    + (discovered ? "Discovered" : ""),
-                    away ? CoreActionType.CHANNEL_USERAWAY : CoreActionType.CHANNEL_USERBACK,
-                    channelClient);
+                    + (discovered ? "Discovered" : ""), channelClient);
             if (away) {
                 eventBus.post(new ChannelUserAwayEvent(owner, channelClient));
             } else {
@@ -348,8 +334,7 @@ public class ChannelEventHandler extends EventHandler implements
 
         final StringBuffer messageType = new StringBuffer("channelNotice");
         triggerAction(messageType, CoreActionType.CHANNEL_NOTICE, client, message);
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_NOTICE,
-                client, message);
+        owner.doNotification(date, messageType.toString(), client, message);
     }
 
     @Override
@@ -366,14 +351,12 @@ public class ChannelEventHandler extends EventHandler implements
                 triggerAction(messageType, CoreActionType.CHANNEL_MODESDISCOVERED,
                         modes.length() <= 1 ? "" : modes);
                 owner.doNotification(date, messageType.toString(),
-                        CoreActionType.CHANNEL_MODESDISCOVERED,
                         modes.length() <= 1 ? "" : modes);
             } else {
                 final StringBuffer messageType = new StringBuffer(
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 triggerAction(messageType, CoreActionType.CHANNEL_MODECHANGE, client, modes);
-                owner.doNotification(date, messageType.toString(),
-                        CoreActionType.CHANNEL_MODECHANGE, client, modes);
+                owner.doNotification(date, messageType.toString(), client, modes);
             }
         }
 
@@ -390,7 +373,7 @@ public class ChannelEventHandler extends EventHandler implements
         final StringBuffer messageType = new StringBuffer("channelModeNotice");
         triggerAction(messageType, CoreActionType.CHANNEL_MODE_NOTICE, client, String.
                 valueOf(prefix), message);
-        owner.doNotification(date, messageType.toString(), CoreActionType.CHANNEL_MODE_NOTICE,
+        owner.doNotification(date, messageType.toString(),
                 client, String.valueOf(prefix), message);
     }
 
@@ -402,8 +385,7 @@ public class ChannelEventHandler extends EventHandler implements
         final StringBuffer messageType = new StringBuffer("channelListModeRetrieved");
         triggerAction(messageType, CoreActionType.CHANNEL_LISTMODERETRIEVED,
                 Character.valueOf(mode));
-        owner.doNotification(date, messageType.toString(),
-                CoreActionType.CHANNEL_LISTMODERETRIEVED, Character.valueOf(mode));
+        owner.doNotification(date, messageType.toString(), Character.valueOf(mode));
     }
 
     private boolean triggerAction(final StringBuffer messageType, final ActionType actionType,

src/com/dmdirc/Query.java

@@ -146,11 +146,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
             if (!part.isEmpty()) {
                 server.getParser().sendMessage(target, part);
 
-                doNotification("querySelfMessage",
-                        CoreActionType.QUERY_SELF_MESSAGE,
+                doNotification("querySelfMessage", server.getParser().getLocalClient(), part);
+                triggerAction("querySelfMessage", CoreActionType.QUERY_SELF_MESSAGE,
                         server.getParser().getLocalClient(), part);
-                triggerAction("querySelfMessage", CoreActionType.QUERY_SELF_MESSAGE, server.
-                        getParser().getLocalClient(), part);
             }
         }
     }
@@ -192,8 +190,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         if (maxLineLength >= action.length() + 2) {
             server.getParser().sendAction(getNickname(), action);
 
-            doNotification("querySelfAction", CoreActionType.QUERY_SELF_ACTION,
-                    client, action);
+            doNotification("querySelfAction", client, action);
             triggerAction("querySelfAction", CoreActionType.QUERY_SELF_ACTION, client, action);
         } else {
             addLine("actionTooLong", action.length());

src/com/dmdirc/ServerEventHandler.java

@@ -174,8 +174,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        owner.doNotification("privateCTCP", CoreActionType.SERVER_CTCP,
-                owner.getParser().getClient(host), type, message);
+        owner.doNotification("privateCTCP", owner.getParser().getClient(host), type, message);
         if (triggerAction("privateCTCP", CoreActionType.SERVER_CTCP, owner.getParser().getClient(
                 host), type, message)) {
             owner.sendCTCPReply(owner.parseHostmask(host)[0], type, message);
@@ -187,8 +186,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        owner.doNotification("privateCTCPreply", CoreActionType.SERVER_CTCPR,
-                owner.getParser().getClient(host), type, message);
+        owner.doNotification("privateCTCPreply", owner.getParser().getClient(host), type, message);
         triggerAction("privateCTCPreply", CoreActionType.SERVER_CTCPR, owner.getParser().getClient(
                 host), type, message);
     }
@@ -205,8 +203,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        owner.doNotification("privateNotice", CoreActionType.SERVER_NOTICE,
-                owner.getParser().getClient(host), message);
+        owner.doNotification("privateNotice", owner.getParser().getClient(host), message);
         triggerAction("privateNotice", CoreActionType.SERVER_NOTICE, owner.getParser().getClient(
                 host), message);
     }
@@ -216,8 +213,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        owner.doNotification("serverNotice", CoreActionType.SERVER_SERVERNOTICE,
-                owner.getParser().getClient(host), message);
+        owner.doNotification("serverNotice", owner.getParser().getClient(host), message);
         triggerAction("serverNotice", CoreActionType.SERVER_SERVERNOTICE, owner.getParser().
                 getClient(host), message);
     }
@@ -226,7 +222,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDStart(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        owner.doNotification("motdStart", CoreActionType.SERVER_MOTDSTART, data);
+        owner.doNotification("motdStart", data);
         triggerAction("motdStart", CoreActionType.SERVER_MOTDSTART, data);
     }
 
@@ -234,7 +230,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDLine(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        owner.doNotification("motdLine", CoreActionType.SERVER_MOTDLINE, data);
+        owner.doNotification("motdLine", data);
         triggerAction("motdLine", CoreActionType.SERVER_MOTDLINE, data);
     }
 
@@ -243,7 +239,7 @@ public class ServerEventHandler extends EventHandler implements
             final boolean noMOTD, final String data) {
         checkParser(parser);
 
-        owner.doNotification("motdEnd", CoreActionType.SERVER_MOTDEND, data);
+        owner.doNotification("motdEnd", data);
         triggerAction("motdEnd", CoreActionType.SERVER_MOTDEND, data);
     }
 
@@ -290,10 +286,10 @@ public class ServerEventHandler extends EventHandler implements
         }
 
         if (currentState == AwayState.AWAY) {
-            owner.doNotification("away", CoreActionType.SERVER_AWAY, reason);
+            owner.doNotification("away", reason);
             triggerAction("away", CoreActionType.SERVER_AWAY, reason);
         } else {
-            owner.doNotification("back", CoreActionType.SERVER_BACK);
+            owner.doNotification("back");
             triggerAction("back", CoreActionType.SERVER_BACK);
         }
     }
@@ -320,7 +316,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onNoticeAuth(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        owner.doNotification("authNotice", CoreActionType.SERVER_AUTHNOTICE, data);
+        owner.doNotification("authNotice", data);
         triggerAction("authNotice", CoreActionType.SERVER_AUTHNOTICE, data);
     }
 
@@ -329,8 +325,7 @@ public class ServerEventHandler extends EventHandler implements
             final String target, final String host) {
         checkParser(parser);
 
-        owner.doNotification("unknownNotice", CoreActionType.SERVER_UNKNOWNNOTICE,
-                host, target, message);
+        owner.doNotification("unknownNotice", host, target, message);
         triggerAction("unknownNotice", CoreActionType.SERVER_UNKNOWNNOTICE, host, target, message);
     }
 
@@ -342,12 +337,11 @@ public class ServerEventHandler extends EventHandler implements
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
             owner.getQuery(target).doNotification("querySelfExternalMessage",
-                    CoreActionType.QUERY_SELF_MESSAGE, parser.getLocalClient(), message);
+                    parser.getLocalClient(), message);
             triggerAction("querySelfExternalMessage", CoreActionType.QUERY_SELF_MESSAGE, parser.
                     getLocalClient(), message);
         } else {
-            owner.doNotification("unknownMessage", CoreActionType.SERVER_UNKNOWNNOTICE,
-                    host, target, message);
+            owner.doNotification("unknownMessage", host, target, message);
             triggerAction("unknownMessage", CoreActionType.SERVER_UNKNOWNNOTICE, host, target,
                     message);
         }
@@ -361,11 +355,10 @@ public class ServerEventHandler extends EventHandler implements
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
             owner.getQuery(target).doNotification("querySelfExternalAction",
-                    CoreActionType.QUERY_SELF_ACTION, parser.getLocalClient(), message);
+                    parser.getLocalClient(), message);
             triggerAction("querySelfExternalAction", CoreActionType.QUERY_SELF_ACTION, message);
         } else {
-            owner.doNotification("unknownAction", CoreActionType.SERVER_UNKNOWNACTION,
-                    host, target, message);
+            owner.doNotification("unknownAction", host, target, message);
             triggerAction("unknownAction", CoreActionType.SERVER_UNKNOWNACTION, host, target,
                     message);
         }
@@ -376,8 +369,7 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String host, final String modes) {
         checkParser(parser);
 
-        owner.doNotification("userModeChanged", CoreActionType.SERVER_USERMODES,
-                owner.getParser().getClient(host), modes);
+        owner.doNotification("userModeChanged", owner.getParser().getClient(host), modes);
         triggerAction("userModeChanged", CoreActionType.SERVER_USERMODES, owner.getParser().
                 getClient(host), modes);
     }
@@ -388,8 +380,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         owner.doNotification(modes.isEmpty() || "+".equals(modes)
-                ? "userNoModes" : "userModeDiscovered",
-                CoreActionType.SERVER_USERMODES, client, modes);
+                ? "userNoModes" : "userModeDiscovered", client, modes);
         triggerAction(modes.isEmpty() || "+".equals(modes) ? "userNoModes" : "userModeDiscovered",
                 CoreActionType.SERVER_USERMODES, client, modes);
     }
@@ -401,7 +392,6 @@ public class ServerEventHandler extends EventHandler implements
 
         owner.addInvite(new Invite(owner, channel, userHost));
         owner.doNotification("inviteReceived",
-                CoreActionType.SERVER_INVITERECEIVED,
                 owner.getParser().getClient(userHost), channel);
         triggerAction("inviteReceived", CoreActionType.SERVER_INVITERECEIVED, owner.getParser().
                 getClient(userHost), channel);
@@ -412,8 +402,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        owner.doNotification("wallop", CoreActionType.SERVER_WALLOPS,
-                owner.getParser().getClient(host), message);
+        owner.doNotification("wallop", owner.getParser().getClient(host), message);
         triggerAction("wallop", CoreActionType.SERVER_WALLOPS, owner.getParser().getClient(host),
                 message);
 
@@ -424,8 +413,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        owner.doNotification("walluser", CoreActionType.SERVER_WALLUSERS,
-                owner.getParser().getClient(host), message);
+        owner.doNotification("walluser", owner.getParser().getClient(host), message);
         triggerAction("walluser", CoreActionType.SERVER_WALLUSERS, owner.getParser().getClient(host),
                 message);
     }
@@ -435,8 +423,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        owner.doNotification("walldesync", CoreActionType.SERVER_WALLDESYNC,
-                owner.getParser().getClient(host), message);
+        owner.doNotification("walldesync", owner.getParser().getClient(host), message);
         triggerAction("walldesync", CoreActionType.SERVER_WALLDESYNC, owner.getParser().getClient(
                 host), message);
     }
@@ -447,8 +434,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         if (client.equals(owner.getParser().getLocalClient())) {
-            owner.doNotification("selfNickChange", CoreActionType.SERVER_NICKCHANGE,
-                    oldNick, client.getNickname());
+            owner.doNotification("selfNickChange", oldNick, client.getNickname());
             triggerAction("selfNickChange", CoreActionType.SERVER_NICKCHANGE, oldNick, client.
                     getNickname());
             owner.updateTitle();
@@ -459,7 +445,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onServerError(final Parser parser, final Date date, final String message) {
         checkParser(parser);
 
-        owner.doNotification("serverError", CoreActionType.SERVER_ERROR, message);
+        owner.doNotification("serverError", message);
         triggerAction("serverError", CoreActionType.SERVER_ERROR, message);
     }
 

src/com/dmdirc/WritableFrameContainer.java

@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
@@ -174,14 +173,12 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * Processes and displays a notification.
      *
      * @param messageType The name of the formatter to be used for the message
-     * @param actionType  The action type to be used
      * @param args        The arguments for the message
      *
      * @return True if any further behaviour should be executed, false otherwise
      */
-    public boolean doNotification(final String messageType,
-            final ActionType actionType, final Object... args) {
-        return doNotification(new Date(), messageType, actionType, args);
+    public boolean doNotification(final String messageType, final Object... args) {
+        return doNotification(new Date(), messageType, args);
     }
 
     /**
@@ -189,13 +186,11 @@ public abstract class WritableFrameContainer extends FrameContainer {
      *
      * @param date        The date/time at which the event occured
      * @param messageType The name of the formatter to be used for the message
-     * @param actionType  The action type to be used
      * @param args        The arguments for the message
      *
      * @return True if any further behaviour should be executed, false otherwise
      */
-    public boolean doNotification(final Date date, final String messageType,
-            final ActionType actionType, final Object... args) {
+    public boolean doNotification(final Date date, final String messageType, final Object... args) {
         final List<Object> messageArgs = new ArrayList<>();
         final List<Object> actionArgs = new ArrayList<>();
         final StringBuffer buffer = new StringBuffer(messageType);