Initial workon ChannelClient.

src/com/dmdirc/Channel.java

@@ -28,9 +28,11 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.User;
@@ -57,7 +59,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -80,6 +81,8 @@ public class Channel extends MessageTarget implements GroupChat {
     private final ChannelEventHandler eventHandler;
     /** The migrator to use to migrate our config provider. */
     private final ConfigProviderMigrator configMigrator;
+    /** Factory for creating {@link GroupChatUser}s */
+    private final GroupChatUserFactory groupChatUserFactory;
     /** Whether we're in this channel or not. */
     private boolean isOnChannel;
     /** Whether we should send WHO requests for this channel. */
@@ -113,7 +116,8 @@ public class Channel extends MessageTarget implements GroupChat {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final BackBufferFactory backBufferFactory) {
+            final BackBufferFactory backBufferFactory,
+            final GroupChatUserFactory groupChatUserFactory) {
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
@@ -133,6 +137,7 @@ public class Channel extends MessageTarget implements GroupChat {
         this.configMigrator = configMigrator;
         this.channelInfo = newChannelInfo;
         this.server = newServer;
+        this.groupChatUserFactory = groupChatUserFactory;
 
         getConfigManager().getBinder().bind(this, Channel.class);
 
@@ -171,12 +176,12 @@ public class Channel extends MessageTarget implements GroupChat {
             return;
         }
 
-        final ClientInfo me = server.getParser().get().getLocalClient();
-        final String[] details = getDetails(channelInfo.getChannelClient(me));
+        final GroupChatUser me = getUser(server.getLocalUser());
+        final String[] details = getDetails(me);
 
         splitLine(line).stream().filter(part -> !part.isEmpty()).forEach(part -> {
             final ChannelSelfMessageEvent event =
-                    new ChannelSelfMessageEvent(this, channelInfo.getChannelClient(me), part);
+                    new ChannelSelfMessageEvent(this, me, part);
             final String format =
                     EventUtils.postDisplayable(getEventBus(), event, "channelSelfMessage");
             addLine(format, details[0], details[1], details[2], details[3], part, channelInfo);
@@ -200,15 +205,15 @@ public class Channel extends MessageTarget implements GroupChat {
             return;
         }
 
-        final ClientInfo me = server.getParser().get().getLocalClient();
-        final String[] details = getDetails(channelInfo.getChannelClient(me));
+
+        final GroupChatUser me = getUser(server.getLocalUser());
+        final String[] details = getDetails(me);
 
         if (server.getParser().get().getMaxLength("PRIVMSG", getChannelInfo().getName())
                 <= action.length()) {
             addLine("actionTooLong", action.length());
         } else {
-            final ChannelSelfActionEvent event = new ChannelSelfActionEvent(this,
-                    channelInfo.getChannelClient(me), action);
+            final ChannelSelfActionEvent event = new ChannelSelfActionEvent(this, me, action);
             final String format = EventUtils.postDisplayable(getEventBus(), event,
                     "channelSelfAction");
             addLine(format, details[0], details[1], details[2], details[3], action, channelInfo);
@@ -388,16 +393,16 @@ public class Channel extends MessageTarget implements GroupChat {
     /**
      * Returns a string containing the most important mode for the specified client.
      *
-     * @param channelClient The channel client to check.
+     * @param user The channel client to check.
      *
      * @return A string containing the most important mode, or an empty string if there are no
      *         (known) modes.
      */
-    private String getModes(final ChannelClientInfo channelClient) {
-        if (channelClient == null || !showModePrefix) {
+    private String getModes(final GroupChatUser user) {
+        if (user == null || !showModePrefix) {
             return "";
         } else {
-            return channelClient.getImportantModePrefix();
+            return user.getImportantMode();
         }
     }
 
@@ -408,7 +413,7 @@ public class Channel extends MessageTarget implements GroupChat {
      *
      * @return A string[] containing displayable components
      */
-    private String[] getDetails(final ChannelClientInfo client) {
+    private String[] getDetails(final GroupChatUser client) {
         if (client == null) {
             // WTF?
             throw new UnsupportedOperationException("getDetails called with"
@@ -417,24 +422,22 @@ public class Channel extends MessageTarget implements GroupChat {
 
         final String[] res = {
             getModes(client),
-            Styliser.CODE_NICKNAME + client.getClient().getNickname() + Styliser.CODE_NICKNAME,
-            client.getClient().getUsername(),
-            client.getClient().getHostname(),};
+            Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME,
+            client.getUsername().orElse(""),
+            client.getHostname().orElse(""),};
 
         if (showColours) {
-            final Map<?, ?> map = client.getMap();
-
-            if (map.containsKey(ChannelClientProperty.TEXT_FOREGROUND)) {
+            final Optional<Colour> foreground
+                    = client.getDisplayProperty(DisplayProperty.FOREGROUND_COLOUR);
+            final Optional<Colour> background
+                    = client.getDisplayProperty(DisplayProperty.BACKGROUND_COLOUR);
+            if (foreground.isPresent()) {
                 final String prefix;
-
-                if (map.containsKey(ChannelClientProperty.TEXT_BACKGROUND)) {
-                    prefix = ',' + ColourUtils.getHex((Colour) map.get(
-                            ChannelClientProperty.TEXT_BACKGROUND));
+                if (background.isPresent()) {
+                    prefix = ',' + ColourUtils.getHex(background.get());
                 } else {
-                    prefix = Styliser.CODE_HEXCOLOUR + ColourUtils.getHex((Colour) map.get(
-                            ChannelClientProperty.TEXT_FOREGROUND));
+                    prefix = Styliser.CODE_HEXCOLOUR + ColourUtils.getHex(foreground.get());
                 }
-
                 res[1] = prefix + res[1] + Styliser.CODE_HEXCOLOUR;
             }
         }
@@ -456,7 +459,7 @@ public class Channel extends MessageTarget implements GroupChat {
         } else if (arg instanceof ChannelClientInfo) {
             // Format ChannelClientInfos
 
-            final ChannelClientInfo clientInfo = (ChannelClientInfo) arg;
+            final GroupChatUser clientInfo = getUserFromClient((ChannelClientInfo) arg);
             args.addAll(Arrays.asList(getDetails(clientInfo)));
 
             return true;
@@ -555,4 +558,14 @@ public class Channel extends MessageTarget implements GroupChat {
         return Optional.of(server);
     }
 
+    public GroupChatUser getUserFromClient(final ChannelClientInfo client) {
+        return groupChatUserFactory.getGroupChatUser(
+                server.getUserFromClientInfo(client.getClient()), this);
+    }
+
+    @Override
+    public GroupChatUser getUser(final User user) {
+        return groupChatUserFactory.getGroupChatUser(user, this);
+    }
+
 }

src/com/dmdirc/ChannelClient.java

@@ -22,10 +22,14 @@
 
 package com.dmdirc;
 
+import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 
+import java.util.Optional;
+
 /**
  * Implementation of a {@link GroupChatUser}.
  */
@@ -33,10 +37,12 @@ public class ChannelClient implements GroupChatUser {
 
     private final User user;
     private final GroupChat groupChat;
+    private final DisplayPropertyMap properties;
 
     public ChannelClient(final User user, final GroupChat groupChat) {
         this.user = user;
         this.groupChat = groupChat;
+        properties = new DisplayPropertyMap();
     }
 
     @Override
@@ -49,9 +55,50 @@ public class ChannelClient implements GroupChatUser {
         return groupChat;
     }
 
+    @Override
+    public String getImportantMode() {
+        return "";
+        // TODO: Implement this.
+    }
+
     @Override
     public String getAllModes() {
         // TODO: Implement this.
         return "";
     }
+
+    @Override
+    public String getNickname() {
+        return getUser().getNickname();
+    }
+
+    @Override
+    public Optional<String> getUsername() {
+        return getUser().getUsername();
+    }
+
+    @Override
+    public Optional<String> getHostname() {
+        return getUser().getHostname();
+    }
+
+    @Override
+    public Optional<String> getRealname() {
+        return getUser().getRealname();
+    }
+
+    @Override
+    public <T> void setDisplayProperty(final DisplayProperty<T> property, final T value) {
+        properties.put(property, value);
+    }
+
+    @Override
+    public <T> Optional<T> getDisplayProperty(final DisplayProperty<T> property) {
+        return properties.get(property);
+    }
+
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
 }

src/com/dmdirc/ChannelEventHandler.java

@@ -135,7 +135,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ChannelMessageEvent event = new ChannelMessageEvent(owner, client, message);
+        final ChannelMessageEvent event = new ChannelMessageEvent(owner,
+                owner.getUserFromClient(client), message);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfExternalMessage" : "channelMessage");
         owner.doNotification(date, format, client, message);
@@ -252,7 +253,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final ChannelActionEvent event = new ChannelActionEvent(owner, client, message);
+        final ChannelActionEvent event = new ChannelActionEvent(owner,
+                owner.getUserFromClient(client), message);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfExternalAction" : "channelAction");
         owner.doNotification(date, format, client, message);
@@ -357,7 +359,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ChannelNoticeEvent event = new ChannelNoticeEvent(owner, client, message);
+        final ChannelNoticeEvent event = new ChannelNoticeEvent(owner,
+                owner.getUserFromClient(client), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelNotice");
         owner.doNotification(date, format, client, message);
     }

src/com/dmdirc/ChannelFactory.java

@@ -45,24 +45,28 @@ public class ChannelFactory {
     private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
+    private final GroupChatUserFactory groupChatUserFactory;
 
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder, final DMDircMBassador eventBus,
-            final BackBufferFactory backBufferFactory) {
+            final BackBufferFactory backBufferFactory,
+            final GroupChatUserFactory groupChatUserFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
+        this.groupChatUserFactory = groupChatUserFactory;
     }
 
     public Channel getChannel(final Server server,
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         return new Channel(server, channelInfo, configMigrator, tabCompleterFactory,
-                commandController, messageSinkManager, urlBuilder, eventBus, backBufferFactory);
+                commandController, messageSinkManager, urlBuilder, eventBus, backBufferFactory,
+                groupChatUserFactory);
     }
 }

src/com/dmdirc/events/BaseChannelActionEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Base class for channel action events.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class BaseChannelActionEvent extends BaseChannelTextEvent {
 
     public BaseChannelActionEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public BaseChannelActionEvent(final Channel channel, final ChannelClientInfo client,
+    public BaseChannelActionEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/BaseChannelMessageEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Base channel message event.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class BaseChannelMessageEvent extends BaseChannelTextEvent {
 
     public BaseChannelMessageEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public BaseChannelMessageEvent(final Channel channel, final ChannelClientInfo client,
+    public BaseChannelMessageEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/BaseChannelTextEvent.java

@@ -23,31 +23,31 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Base class for channel text events.
  */
 public class BaseChannelTextEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String message;
 
     public BaseChannelTextEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
     public BaseChannelTextEvent(final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelActionEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel action occurs.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelActionEvent extends BaseChannelActionEvent {
 
     public ChannelActionEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelActionEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelActionEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelMessageEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel message occurs.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelMessageEvent extends BaseChannelMessageEvent {
 
     public ChannelMessageEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelMessageEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelMessageEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelNoticeEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel mode is received.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelNoticeEvent extends BaseChannelTextEvent {
 
     public ChannelNoticeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelNoticeEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelNoticeEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelSelfActionEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel self action occurs.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelSelfActionEvent extends BaseChannelActionEvent {
 
     public ChannelSelfActionEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelSelfActionEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelSelfActionEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelSelfMessageEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel self message occurs.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelSelfMessageEvent extends BaseChannelMessageEvent {
 
     public ChannelSelfMessageEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelSelfMessageEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelSelfMessageEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/interfaces/GroupChat.java

@@ -120,4 +120,6 @@ public interface GroupChat extends Chat {
      */
     void setTopic(final String topic);
 
+    GroupChatUser getUser(final User user);
+
 }

src/com/dmdirc/interfaces/GroupChatUser.java

@@ -22,6 +22,11 @@
 
 package com.dmdirc.interfaces;
 
+import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.events.DisplayPropertyMap;
+
+import java.util.Optional;
+
 /**
  * Describes a {@link User} that is present on a {@link GroupChat}.
  */
@@ -42,6 +47,14 @@ public interface GroupChatUser {
      */
     GroupChat getGroupChat();
 
+    /**
+     * Returns the most important mode that the client holds in its textual
+     * form (e.g. o, v, etc)
+     *
+     * @return The most important mode the client holds, or an empty string
+     */
+    String getImportantMode();
+
     /**
      * Returns a list of all modes known to be held by the client, in their
      * textual form (e.g. o, v, etc)
@@ -49,4 +62,57 @@ public interface GroupChatUser {
      * @return All modes the client holds, or an empty string
      */
     String getAllModes();
+
+    /**
+     * Retrieves the nickname or display name used by this client.
+     *
+     * @return This client's nickname
+     */
+    String getNickname();
+
+    /**
+     * Retrieves the username or ident used by this client.
+     *
+     * @return This client's username
+     */
+    Optional<String> getUsername();
+
+    /**
+     * Retrieves the hostname that this client is connecting from.
+     *
+     * @return This client's hostname
+     */
+    Optional<String> getHostname();
+
+    /**
+     * Retrieves the full/real name of the client.
+     *
+     * @return This client's real name
+     */
+    Optional<String> getRealname();
+
+    /**
+     * Sets a property relating to how this {@link GroupChatUser} should be displayed.
+     *
+     * @param property The property to be set
+     * @param value The value of the property
+     * @param <T> The type of value that the property takes.
+     */
+    <T> void setDisplayProperty(final DisplayProperty<T> property, final T value);
+
+    /**
+     * Retrieves a property relating to how this {@link GroupChatUser} should be displayed.
+     *
+     * @param property The property to be retrieved.
+     * @param <T> The type of value that the property takes.
+     * @return An optional value for the property.
+     */
+    <T> Optional<T> getDisplayProperty(final DisplayProperty<T> property);
+
+    /**
+     * Gets the map of all display properties for this {@link GroupChatUser}.
+     *
+     * @return The map of display properties.
+     */
+    DisplayPropertyMap getDisplayProperties();
 }

test/com/dmdirc/ui/messages/EventPropertyManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.ui.messages;
 import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ChannelMessageEvent;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +44,7 @@ public class EventPropertyManagerTest {
 
     @Mock private DMDircMBassador eventBus;
     @Mock private Channel channel;
-    @Mock private ChannelClientInfo client;
+    @Mock private GroupChatUser client;
 
     @Before
     public void setUp() {