Fixups for GroupChatUser.

awaycolours/src/com/dmdirc/addons/awaycolours/AwayColoursManager.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.awaycolours;
 
-import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.messages.ColourManager;
@@ -87,12 +87,7 @@ public class AwayColoursManager {
 
     @Handler
     public void handleAwayEvent(final ChannelUserAwayEvent event) {
-        if (nicklist) {
-            event.getUser().getMap().put(ChannelClientProperty.NICKLIST_FOREGROUND, colour);
-        }
-        if (text) {
-            event.getUser().getMap().put(ChannelClientProperty.TEXT_FOREGROUND, colour);
-        }
+        event.getUser().setDisplayProperty(DisplayProperty.FOREGROUND_COLOUR, colour);
         if (nicklist || text) {
             event.getChannel().refreshClients();
         }
@@ -100,12 +95,7 @@ public class AwayColoursManager {
 
     @Handler
     public void handleBackEvent(final ChannelUserBackEvent event) {
-        if (nicklist) {
-            event.getUser().getMap().remove(ChannelClientProperty.NICKLIST_FOREGROUND);
-        }
-        if (text) {
-            event.getUser().getMap().remove(ChannelClientProperty.TEXT_FOREGROUND);
-        }
+        event.getUser().setDisplayProperty(DisplayProperty.FOREGROUND_COLOUR, colour);
         if (nicklist || text) {
             event.getChannel().refreshClients();
         }

contactlist/src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -80,12 +80,12 @@ public class ContactListListener {
 
     @Handler
     public void handleUserAway(final ChannelUserAwayEvent event) {
-        clientAdded(event.getUser());
+        //clientAdded(event.getUser());
     }
 
     @Handler
     public void handleUserBack(final ChannelUserBackEvent event) {
-        clientAdded(event.getUser());
+        //clientAdded(event.getUser());
     }
 
     @Handler

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

@@ -45,6 +45,7 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -548,6 +549,17 @@ 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
+     *
+     * @return name to display
+     */
+    protected String getDisplayName(final GroupChatUser channelClient) {
+        return getDisplayName(channelClient, "");
+    }
+
     /**
      * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
      *
@@ -568,6 +580,25 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
+    /**
+     * 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 GroupChatUser channelClient, final String overrideNick) {
+        if (channelClient == null) {
+            return overrideNick.isEmpty() ? "Unknown Client" : overrideNick;
+        } else if (overrideNick.isEmpty()) {
+            return channelmodeprefix ? channelClient.toString() : channelClient.getNickname();
+        } else {
+            return channelmodeprefix ? channelClient.getImportantMode() + overrideNick :
+                    overrideNick;
+        }
+    }
+
     /**
      * Shows the history window for the specified target, if available.
      *