Use new formatter for mode discovery.

res/com/dmdirc/ui/messages/format.yml

@@ -123,6 +123,12 @@ ChannelModeChangeEvent:
 ChannelSelfModeChangeEvent:
   format: "* You set mode: {{modes}}."
   colour: 3
+ChannelModesDiscoveredEvent:
+  format: "* Channel modes for {{channel.name}} are: {{modes}}."
+  colour: 3
+ChannelNoModesDiscoveredEvent:
+  format: "* There are no channel modes for {{channel.name}}."
+  colour: 3
 
 ################## Channel user events #############################################################
 
@@ -172,8 +178,6 @@ CommandOutputEvent:
   format: "{{message}}"
 
 ################## TODO ############################################################################
-#  channelNoModes=3* There are no channel modes for %2$s.
-#  channelModeDiscovered=3* Channel modes for %2$s are: %1$s.
 #  userModeChanged=3* %1$s sets user mode: %4$s.
 #  userNoModes=3* No user modes.
 #  userModeDiscovered=3* User modes are: %4$s.

src/com/dmdirc/ChannelEventHandler.java

@@ -34,6 +34,7 @@ import com.dmdirc.events.ChannelModeChangeEvent;
 import com.dmdirc.events.ChannelModeNoticeEvent;
 import com.dmdirc.events.ChannelModesDiscoveredEvent;
 import com.dmdirc.events.ChannelNickChangeEvent;
+import com.dmdirc.events.ChannelNoModesDiscoveredEvent;
 import com.dmdirc.events.ChannelNoTopicEvent;
 import com.dmdirc.events.ChannelNoticeEvent;
 import com.dmdirc.events.ChannelPartEvent;
@@ -55,7 +56,6 @@ import com.dmdirc.parser.events.OtherAwayStateEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.util.EventUtils;
 
 import com.google.common.base.Strings;
 
@@ -280,11 +280,12 @@ public class ChannelEventHandler extends EventHandler {
         final Date date = event.getDate();
 
         if (host.isEmpty()) {
-            final ChannelModesDiscoveredEvent coreEvent = new ChannelModesDiscoveredEvent(
-                    date.getTime(), owner, modes.length() <= 1 ? "" : modes);
-            final String format = EventUtils.postDisplayable(eventBus, coreEvent,
-                    modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-            owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
+            if (modes.length() <= 1) {
+                eventBus.publishAsync(new ChannelNoModesDiscoveredEvent(date.getTime(), owner));
+            } else {
+                eventBus.publishAsync(
+                        new ChannelModesDiscoveredEvent(date.getTime(), owner,modes));
+            }
         } else if (isMyself(client)) {
             eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
                     groupChatUserManager.getUserFromClient(client, owner), modes));

src/com/dmdirc/ParserFilteringListener.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2015 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;
+
+import com.dmdirc.parser.interfaces.Parser;
+
+/**
+ * Created by chris on 31/01/15.
+ */
+public interface ParserFilteringListener {
+
+    Parser getParser();
+
+}

src/com/dmdirc/events/ChannelNoModesDiscoveredEvent.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2006-2015 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.interfaces.GroupChat;
+
+/**
+ * Fired when channel mode discovery is complete and there are no modes on the channel.
+ */
+public class ChannelNoModesDiscoveredEvent extends ChannelDisplayableEvent {
+
+    public ChannelNoModesDiscoveredEvent(final long timestamp, final GroupChat channel) {
+        super(timestamp, channel);
+    }
+
+    public ChannelNoModesDiscoveredEvent(final GroupChat channel) {
+        super(channel);
+    }
+
+}