Make more things use GroupChatUser.

  - Also by AutoValue Topic
  - Also make getUser in Topic Optional

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -51,10 +51,6 @@ import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -270,45 +266,43 @@ public class LoggingManager implements ConfigChangeListener {
     @Handler
     public void handleChannelGotTopic(final ChannelGottopicEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
-        final ChannelInfo channel = event.getChannel().getChannelInfo();
         final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
         final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
 
-        appendLine(filename, "*** Topic is: %s", channel.getTopic());
-        appendLine(filename, "*** Set at: %s on %s by %s", timeFormat.format(1000 * channel.
-                getTopicTime()), dateFormat.format(1000 * channel.getTopicTime()), channel.
-                getTopicSetter());
+        appendLine(filename, "*** Topic is: %s", event.getTopic().getTopic());
+        appendLine(filename, "*** Set at: %s on %s by %s",
+                timeFormat.format(1000 * event.getTopic().getTime()),
+                dateFormat.format(1000 * event.getTopic().getTime()),
+                        event.getTopic().getClient()
+                                .map(GroupChatUser::getNickname).orElse("Unknown"));
     }
 
     @Handler
     public void handleChannelTopicChange(final ChannelTopicChangeEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
-        final GroupChatUser channelClient = event.getTopic().getClient();
         appendLine(filename, "*** %s Changed the topic to: %s",
-                getDisplayName(channelClient), event.getTopic());
+                event.getTopic().getClient().map(this::getDisplayName).orElse(""), event.getTopic());
     }
 
     @Handler
     public void handleChannelJoin(final ChannelJoinEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
-        final ChannelClientInfo channelClient = event.getClient();
-        final ClientInfo client = channelClient.getClient();
-        appendLine(filename, "*** %s (%s) joined the channel",
-                getDisplayName(channelClient), client.toString());
+        final GroupChatUser channelClient = event.getClient();
+        appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient),
+                channelClient.getNickname());
     }
 
     @Handler
     public void handleChannelPart(final ChannelPartEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
         final String message = event.getMessage();
-        final ChannelClientInfo channelClient = event.getClient();
-        final ClientInfo client = channelClient.getClient();
+        final GroupChatUser channelClient = event.getClient();
         if (message.isEmpty()) {
-            appendLine(filename, "*** %s (%s) left the channel",
-                    getDisplayName(channelClient), client.toString());
+            appendLine(filename, "*** %s (%s) left the channel", getDisplayName(channelClient),
+                    channelClient.getNickname());
         } else {
             appendLine(filename, "*** %s (%s) left the channel (%s)",
-                    getDisplayName(channelClient), client.toString(), message);
+                    getDisplayName(channelClient), channelClient.getNickname(), message);
         }
     }
 
@@ -316,21 +310,20 @@ public class LoggingManager implements ConfigChangeListener {
     public void handleChannelQuit(final ChannelQuitEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
         final String reason = event.getMessage();
-        final ChannelClientInfo channelClient = event.getClient();
-        final ClientInfo client = channelClient.getClient();
+        final GroupChatUser channelClient = event.getClient();
         if (reason.isEmpty()) {
             appendLine(filename, "*** %s (%s) Quit IRC",
-                    getDisplayName(channelClient), client.toString());
+                    getDisplayName(channelClient), channelClient.getNickname());
         } else {
             appendLine(filename, "*** %s (%s) Quit IRC (%s)",
-                    getDisplayName(channelClient), client.toString(), reason);
+                    getDisplayName(channelClient), channelClient.getNickname(), reason);
         }
     }
 
     @Handler
     public void handleChannelKick(final ChannelKickEvent event) {
-        final ChannelClientInfo victim = event.getVictim();
-        final ChannelClientInfo perpetrator = event.getClient();
+        final GroupChatUser victim = event.getVictim();
+        final GroupChatUser perpetrator = event.getClient();
         final String reason = event.getReason();
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
 
@@ -353,7 +346,7 @@ public class LoggingManager implements ConfigChangeListener {
     @Handler
     public void handleModeChange(final ChannelModechangeEvent event) {
         final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
-        if (event.getClient().getClient().getNickname().isEmpty()) {
+        if (event.getClient().getNickname().isEmpty()) {
             appendLine(filename, "*** Channel modes are: %s", event.getModes());
         } else {
             appendLine(filename, "*** %s set modes: %s",
@@ -538,17 +531,6 @@ public class LoggingManager implements ConfigChangeListener {
         return false;
     }
 
-    /**
-     * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
-     *
-     * @param channelClient The client to get the display name for
-     *
-     * @return name to display
-     */
-    protected String getDisplayName(final ChannelClientInfo channelClient) {
-        return getDisplayName(channelClient, "");
-    }
-
     /**
      * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
      *
@@ -560,26 +542,6 @@ public class LoggingManager implements ConfigChangeListener {
         return getDisplayName(channelClient, "");
     }
 
-    /**
-     * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
-     *
-     * @param channelClient The client to get the display name for
-     * @param overrideNick  Nickname to display instead of real nickname
-     *
-     * @return name to display
-     */
-    protected String getDisplayName(final ChannelClientInfo channelClient, final String overrideNick) {
-        if (channelClient == null) {
-            return overrideNick.isEmpty() ? "Unknown Client" : overrideNick;
-        } else if (overrideNick.isEmpty()) {
-            return channelmodeprefix ? channelClient.toString() : channelClient.getClient().
-                    getNickname();
-        } else {
-            return channelmodeprefix ? channelClient.getImportantModePrefix() + overrideNick
-                    : overrideNick;
-        }
-    }
-
     /**
      * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
      *
@@ -612,8 +574,7 @@ public class LoggingManager implements ConfigChangeListener {
         if (target instanceof Channel) {
             descriptor = target.getName();
         } else if (target instanceof Query) {
-            final Parser parser = target.getConnection().get().getParser().get();
-            descriptor = parser.getClient(((PrivateChat) target).getHost()).getNickname();
+            descriptor = ((PrivateChat) target).getNickname();
         } else {
             // Unknown component
             return false;

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -27,15 +27,15 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ChannelGotnamesEvent;
 import com.dmdirc.events.ChannelJoinEvent;
+import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.colours.Colour;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,6 +45,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import autovalue.shaded.com.google.common.common.collect.Maps;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -82,12 +83,8 @@ public class NickColourManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelNames(final ChannelGotnamesEvent event) {
-        final ChannelInfo chanInfo = event.getChannel().getChannelInfo();
         final String network = event.getChannel().getConnection().get().getNetwork();
-
-        for (ChannelClientInfo client : chanInfo.getChannelClients()) {
-            colourClient(network, client);
-        }
+        event.getChannel().getUsers().forEach(client -> colourClient(network, client));
     }
 
     @Handler
@@ -102,23 +99,20 @@ public class NickColourManager implements ConfigChangeListener {
      * @param network The network to use for the colouring
      * @param client  The client to be coloured
      */
-    private void colourClient(final String network,
-            final ChannelClientInfo client) {
-        final Map<Object, Object> map = client.getMap();
-        final ClientInfo myself = client.getClient().getParser().getLocalClient();
-        final String nickOption1 = "color:"
-                + client.getClient().getParser().getStringConverter().
-                toLowerCase(network + ':' + client.getClient().getNickname());
-        final String nickOption2 = "color:"
-                + client.getClient().getParser().getStringConverter().
-                toLowerCase("*:" + client.getClient().getNickname());
-
-        if (useowncolour && client.getClient().equals(myself)) {
+    private void colourClient(final String network, final GroupChatUser client) {
+        final StringConverter sc = client.getUser().getConnection().getParser().get()
+                .getStringConverter();
+        // TODO: This needs to use the new setDisplayableProperty on GroupChatUser
+        final Map<Object, Object> map = Maps.newHashMap();
+        final User myself = client.getUser();
+        final String nickOption1 = "color:" + sc.toLowerCase(network + ':' + client.getNickname());
+        final String nickOption2 = "color:" + sc.toLowerCase("*:" + client.getNickname());
+
+        if (useowncolour && client.getUser().equals(myself)) {
             final Colour color = colourManager.getColourFromString(owncolour, null);
             putColour(map, color, color);
         } else if (userandomcolour) {
-            putColour(map, getColour(client.getClient().getNickname()), getColour(client.
-                    getClient().getNickname()));
+            putColour(map, getColour(client.getNickname()), getColour(client.getNickname()));
         }
 
         String[] parts = null;

ui_swing/src/com/dmdirc/addons/ui_swing/components/NicklistComparator.java

@@ -57,15 +57,14 @@ public final class NicklistComparator implements Comparator<GroupChatUser>, Seri
     public int compare(final GroupChatUser client1, final GroupChatUser client2) {
         ComparisonChain comparisonChain = ComparisonChain.start();
         if (sortByMode) {
-            comparisonChain = comparisonChain
-                    .compare(client1.getImportantMode(), client2.getImportantMode());
+            comparisonChain = comparisonChain.compare(client1.getImportantMode(),
+                    client2.getImportantMode(), Comparator.<String>naturalOrder());
         }
         if (sortByCase) {
             comparisonChain = comparisonChain.compare(client1.getNickname(), client2.getNickname());
         } else {
-            comparisonChain = comparisonChain
-                    .compare(client1.getNickname().toLowerCase(),
-                            client2.getNickname().toLowerCase());
+            comparisonChain = comparisonChain.compare(client1.getNickname().toLowerCase(),
+                    client2.getNickname().toLowerCase());
         }
         return comparisonChain.result();
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
@@ -166,7 +167,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
      */
     public void setTopic(final Optional<Topic> topic) {
         if (topic.isPresent()) {
-            topicWho.setText("Topic set by " + topic.get().getClient().getNickname()
+            topicWho.setText("Topic set by " + topic.get().getClient()
+                    .map(GroupChatUser::getNickname).orElse("Unknown")
                     + "<br> on " + new Date(1000 * topic.get().getTime()));
             topicText.setText(topic.get().getTopic());
         } else {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicLabel.java

@@ -26,6 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
+import com.dmdirc.interfaces.GroupChatUser;
 
 import java.awt.Color;
 import java.util.Date;
@@ -130,9 +131,11 @@ public class TopicLabel extends JPanel {
 
         TextLabel label;
         if (topic.getTopic().isEmpty()) {
-            label = new TextLabel("Topic unset by " + topic.getClient().getNickname());
+            label = new TextLabel("Topic unset by " + topic.getClient()
+                    .map(GroupChatUser::getNickname).orElse("Unknown"));
         } else {
-            label = new TextLabel("Topic set by " + topic.getClient().getNickname());
+            label = new TextLabel("Topic set by " + topic.getClient()
+                    .map(GroupChatUser::getNickname).orElse("Unknown"));
         }
         add(label, "wmax 450, grow, push, wrap, gapleft 5, pad 0");