Add some more actions.

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

src/com/dmdirc/ChannelEventHandler.java

@@ -24,10 +24,14 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.ChannelListmodesretrievedEvent;
+import com.dmdirc.events.ChannelModechangeEvent;
+import com.dmdirc.events.ChannelModesdiscoveredEvent;
 import com.dmdirc.events.ChannelNickchangeEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
+import com.dmdirc.events.ChannelUsermodechangeEvent;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -269,14 +273,18 @@ public class ChannelEventHandler extends EventHandler implements
             if (host.isEmpty()) {
                 final StringBuffer messageType = new StringBuffer(
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                triggerAction(messageType, CoreActionType.CHANNEL_MODESDISCOVERED,
+                final DisplayableEvent event = new ChannelModesdiscoveredEvent(owner,
                         modes.length() <= 1 ? "" : modes);
+                event.setDisplayFormat(host);
+                eventBus.post(event);
                 owner.doNotification(date, messageType.toString(),
                         modes.length() <= 1 ? "" : modes);
             } else {
                 final StringBuffer messageType = new StringBuffer(
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
-                triggerAction(messageType, CoreActionType.CHANNEL_MODECHANGE, client, modes);
+                final DisplayableEvent event = new ChannelModechangeEvent(owner, client, modes);
+                event.setDisplayFormat(messageType.toString());
+                eventBus.post(event);
                 owner.doNotification(date, messageType.toString(), client, modes);
             }
         }
@@ -298,8 +306,10 @@ public class ChannelEventHandler extends EventHandler implements
             }
 
             final StringBuffer messageType = new StringBuffer(format);
-            triggerAction(messageType, CoreActionType.CHANNEL_USERMODECHANGE, client,
+            final DisplayableEvent event = new ChannelUsermodechangeEvent(owner, client,
                     targetClient, mode);
+            event.setDisplayFormat(format);
+            eventBus.post(event);
             owner.doNotification(date, messageType.toString(), client, targetClient, mode);
         }
     }
@@ -362,14 +372,18 @@ public class ChannelEventHandler extends EventHandler implements
             if (host.isEmpty()) {
                 final StringBuffer messageType = new StringBuffer(
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                triggerAction(messageType, CoreActionType.CHANNEL_MODESDISCOVERED,
+                final DisplayableEvent event = new ChannelModesdiscoveredEvent(owner,
                         modes.length() <= 1 ? "" : modes);
+                event.setDisplayFormat(host);
+                eventBus.post(event);
                 owner.doNotification(date, messageType.toString(),
                         modes.length() <= 1 ? "" : modes);
             } else {
                 final StringBuffer messageType = new StringBuffer(
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
-                triggerAction(messageType, CoreActionType.CHANNEL_MODECHANGE, client, modes);
+                final DisplayableEvent event = new ChannelModechangeEvent(owner, client, modes);
+                event.setDisplayFormat(messageType.toString());
+                eventBus.post(event);
                 owner.doNotification(date, messageType.toString(), client, modes);
             }
         }
@@ -396,9 +410,10 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final char mode) {
         checkParser(parser);
 
-        final StringBuffer messageType = new StringBuffer("channelListModeRetrieved");
-        triggerAction(messageType, CoreActionType.CHANNEL_LISTMODERETRIEVED, mode);
-        owner.doNotification(date, messageType.toString(), mode);
+        final DisplayableEvent event = new ChannelListmodesretrievedEvent(owner, mode);
+        event.setDisplayFormat("channelListModeRetrieved");
+        eventBus.post(event);
+        owner.doNotification(date, "channelListModeRetrieved", mode);
     }
 
     private boolean triggerAction(final StringBuffer messageType, final ActionType actionType,

src/com/dmdirc/actions/CoreActionType.java

@@ -186,16 +186,18 @@ public enum CoreActionType implements ActionType {
     /** Someone marked as back. */
     @Deprecated
     CHANNEL_USERBACK(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'back'"),
-    /** Channel list mode retrieved.
-     *
-     * @since 0.6.3 */
+    /** Channel list mode retrieved. */
+    @Deprecated
     CHANNEL_LISTMODERETRIEVED(ChannelEvents.CHANNEL_LISTMODEEVENT,
             "Channel list mode value retrieved"),
     /** Channel mode discovered. */
+    @Deprecated
     CHANNEL_MODESDISCOVERED(ChannelEvents.CHANNEL_MODEEVENT, "Channel modes discovered"),
     /** Channel mode changes. */
+    @Deprecated
     CHANNEL_MODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel modes"),
     /** Someone changed someone else's user modes. */
+    @Deprecated
     CHANNEL_USERMODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM,
             "Someone changed someone else's modes"),
     /** Someone changed nickname. */

src/com/dmdirc/events/ChannelListmodesretrievedEvent.java

@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * Fired when channel list modes are retrieved.
+ */
+public class ChannelListmodesretrievedEvent extends ChannelDisplayableEvent {
+
+    private final char mode;
+
+    public ChannelListmodesretrievedEvent(final long timestamp, final Channel channel,
+            final char mode) {
+        super(timestamp, channel);
+        this.mode = mode;
+    }
+
+    public ChannelListmodesretrievedEvent(final Channel channel, final char mode) {
+        super(channel);
+        this.mode = mode;
+    }
+
+    public char getMode() {
+        return mode;
+    }
+
+}

src/com/dmdirc/events/ChannelModechangeEvent.java

@@ -0,0 +1,58 @@
+/*
+ * 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 com.dmdirc.parser.interfaces.ChannelClientInfo;
+
+/**
+ * Fired when a channel mode is changed.
+ */
+public class ChannelModechangeEvent extends ChannelDisplayableEvent {
+
+    private final ChannelClientInfo client;
+    private final String modes;
+
+    public ChannelModechangeEvent(final long timestamp, final Channel channel,
+            final ChannelClientInfo client, final String modes) {
+        super(timestamp, channel);
+        this.client = client;
+        this.modes = modes;
+    }
+
+    public ChannelModechangeEvent(final Channel channel,
+            final ChannelClientInfo client, final String modes) {
+        super(channel);
+        this.client = client;
+        this.modes = modes;
+    }
+
+    public ChannelClientInfo getClient() {
+        return client;
+    }
+
+    public String getModes() {
+        return modes;
+    }
+
+}

src/com/dmdirc/events/ChannelModesdiscoveredEvent.java

@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * Fired when channel modes are discovered.
+ */
+public class ChannelModesdiscoveredEvent extends ChannelDisplayableEvent {
+
+    private final String modes;
+
+    public ChannelModesdiscoveredEvent(final long timestamp, final Channel channel,
+            final String modes) {
+        super(timestamp, channel);
+        this.modes = modes;
+    }
+
+    public ChannelModesdiscoveredEvent(final Channel channel, final String modes) {
+        super(channel);
+        this.modes = modes;
+    }
+
+    public String getModes() {
+        return modes;
+    }
+
+}

src/com/dmdirc/events/ChannelUsermodechangeEvent.java

@@ -0,0 +1,65 @@
+/*
+ * 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 com.dmdirc.parser.interfaces.ChannelClientInfo;
+
+/**
+ * Fired when a channel user mode change occurs.
+ */
+public class ChannelUsermodechangeEvent extends ChannelDisplayableEvent {
+
+    private final ChannelClientInfo user;
+    private final ChannelClientInfo victim;
+    private final String modes;
+
+    public ChannelUsermodechangeEvent(final long timestamp, final Channel channel,
+            final ChannelClientInfo user, final ChannelClientInfo victim, final String modes) {
+        super(timestamp, channel);
+        this.user = user;
+        this.victim = victim;
+        this.modes = modes;
+    }
+
+    public ChannelUsermodechangeEvent(final Channel channel,
+            final ChannelClientInfo user, final ChannelClientInfo victim, final String modes) {
+        super(channel);
+        this.user = user;
+        this.victim = victim;
+        this.modes = modes;
+    }
+
+    public ChannelClientInfo getUser() {
+        return user;
+    }
+
+    public ChannelClientInfo getVictim() {
+        return victim;
+    }
+
+    public String getModes() {
+        return modes;
+    }
+
+}