Use new formatter for channel joins.

This, uh, breaks some channels a little. Will fix in a follow-up.

Add support for Optionals in the event property manager.

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

@@ -9,6 +9,17 @@ ServerCtcpReplyEvent:
   format: "-!- CTCP {{type}} reply from {{user.nickname}}: {{content}}."
   colour: 4
 
+################## Channel join/part/quit events ###################################################
+
+ChannelJoinEvent:
+  format: >
+            * {{client.nickname}} ({{client.username}}@{{client.hostname}})
+            has joined {{channel.name}}.
+  colour: 3
+ChannelSelfJoinEvent:
+  format: "* You are now talking in {{channel.name}}."
+  colour: 3
+
 ################## Channel message events ##########################################################
 
 ChannelActionEvent:
@@ -63,8 +74,6 @@ ChannelSelfModeChangeEvent:
 #  channelSelfPartReason=3* You have left the channel.
 #  channelNickChange=3* %1$s%5$s is now known as %2$s.
 #  channelSelfNickChange=3* You are now known as %2$s.
-#  channelJoin=3* %2$s (%3$s@%4$s) has joined %5$s.
-#  channelSelfJoin=3* You are now talking in %5$s.
 #  channelUserAway=14-- %1$s%2$s is now away.
 #  channelUserBack=14-- %1$s%2$s is now back.
 #  channelUserAwayDiscovered=14-- %1$s%2$s is away.

src/com/dmdirc/Channel.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
+import com.dmdirc.events.ChannelSelfJoinEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.NickListClientAddedEvent;
@@ -224,8 +225,7 @@ public class Channel extends MessageTarget implements GroupChat {
         isOnChannel = true;
 
         final User me = server.getLocalUser().get();
-        addLine("channelSelfJoin", "", me.getNickname(), me.getUsername(),
-                me.getHostname(), channelInfo.getName());
+        getEventBus().publishAsync(new ChannelSelfJoinEvent(this, me));
 
         checkWho();
         setIcon("channel");

src/com/dmdirc/ChannelEventHandler.java

@@ -203,10 +203,8 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client) {
         checkParser(parser);
 
-        final ChannelJoinEvent event = new ChannelJoinEvent(date.getTime(), owner,
-                groupChatUserManager.getUserFromClient(client, owner));
-        final String format = EventUtils.postDisplayable(eventBus, event, "channelJoin");
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner));
+        eventBus.publish(new ChannelJoinEvent(date.getTime(), owner,
+                groupChatUserManager.getUserFromClient(client, owner)));
         owner.addClient(groupChatUserManager.getUserFromClient(client, owner));
     }
 

src/com/dmdirc/events/ChannelSelfJoinEvent.java

@@ -0,0 +1,50 @@
+/*
+ * 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.Channel;
+import com.dmdirc.interfaces.User;
+
+/**
+ * Fired when the local user joins a channel.
+ */
+public class ChannelSelfJoinEvent extends ChannelDisplayableEvent {
+
+    private final User client;
+
+    public ChannelSelfJoinEvent(final long timestamp, final Channel channel,
+            final User client) {
+        super(timestamp, channel);
+        this.client = client;
+    }
+
+    public ChannelSelfJoinEvent(final Channel channel, final User client) {
+        super(channel);
+        this.client = client;
+    }
+
+    public User getClient() {
+        return client;
+    }
+
+}

src/com/dmdirc/ui/messages/EventPropertyManager.java

@@ -61,7 +61,13 @@ public class EventPropertyManager {
             final Method method = type.getMethod(methodName);
             // TODO: This is needed for AutoValues, should probably get return types not real types
             method.setAccessible(true);
-            return Optional.ofNullable(method.invoke(object));
+            final Object result = method.invoke(object);
+
+            if (result instanceof Optional<?>) {
+                return Optional.ofNullable(((Optional<?>) result).orElse(null));
+            }
+
+            return Optional.ofNullable(result);
         } catch (ReflectiveOperationException ex) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to format event: could not retrieve property " + property,