Use GroupChatUser some more.

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

@@ -70,12 +70,12 @@ public class ContactListListener {
 
     @Handler
     public void handleClientsUpdated(final NickListClientsChangedEvent event) {
-        event.getUsers().forEach(this::clientAdded);
+        //event.getUsers().forEach(this::clientAdded);
     }
 
     @Handler
     public void handleClientAdded(final NickListClientAddedEvent event) {
-        clientAdded(event.getUser());
+        //clientAdded(event.getUser());
     }
 
     @Handler

nickcolours/plugin.config

@@ -35,6 +35,4 @@ required-services:
 defaults:
   useowncolour=false
   owncolour=ff0000
-  userandomcolour=false
-  settext=false
-  setnicklist=false
+  userandomcolour=false

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

@@ -35,8 +35,8 @@ import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
 import com.dmdirc.events.NickListClientsChangedEvent;
 import com.dmdirc.events.NickListUpdatedEvent;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
@@ -61,7 +61,7 @@ public class NickList extends JScrollPane implements MouseListener {
     /** A version number for this class. */
     private static final long serialVersionUID = 10;
     /** Nick list. */
-    private final JList<ChannelClientInfo> nickList;
+    private final JList<GroupChatUser> nickList;
     /** Parent frame. */
     private final ChannelFrame frame;
     /** The colour manager to use for this nicklist. */
@@ -81,7 +81,8 @@ public class NickList extends JScrollPane implements MouseListener {
         this.colourManager = colourManagerFactory.getColourManager(config);
 
         nickList = new JList<>();
-        nickList.setCellRenderer(new NicklistRenderer(config, nickList, colourManager));
+        nickList.setCellRenderer(new NicklistRenderer(nickList.getCellRenderer(), config,
+                nickList, colourManager));
         nickList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
         nickList.addMouseListener(this);
@@ -95,7 +96,7 @@ public class NickList extends JScrollPane implements MouseListener {
         setPreferredSize(new Dimension(splitPanePosition, 0));
         setMinimumSize(new Dimension(75, 0));
 
-        nicklistModel.replace(((Channel) frame.getContainer()).getChannelInfo().getChannelClients());
+        nicklistModel.replace(((Channel) frame.getContainer()).getUsers());
         frame.getContainer().getEventBus().subscribe(this);
         config.getBinder().bind(this, NickList.class);
     }
@@ -133,15 +134,15 @@ public class NickList extends JScrollPane implements MouseListener {
             return;
         }
         if (checkCursorInSelectedCell() || selectNickUnderCursor()) {
-            final List<ChannelClientInfo> values = nickList.getSelectedValuesList();
+            final List<GroupChatUser> values = nickList.getSelectedValuesList();
             final StringBuilder builder = new StringBuilder();
 
-            for (ChannelClientInfo value : values) {
+            for (GroupChatUser value : values) {
                 if (builder.length() > 0) {
                     builder.append('\n');
                 }
 
-                builder.append(value.getClient().getNickname());
+                builder.append(value.getNickname());
             }
 
             frame.showPopupMenu(new ClickTypeValue(ClickType.NICKNAME,

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

@@ -22,7 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
+
+import com.google.common.collect.ComparisonChain;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -30,8 +32,7 @@ import java.util.Comparator;
 /**
  * Compares nicklist entries to each other, for sorting purposes.
  */
-public final class NicklistComparator implements Comparator<ChannelClientInfo>,
-        Serializable {
+public final class NicklistComparator implements Comparator<GroupChatUser>, Serializable {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -52,34 +53,21 @@ public final class NicklistComparator implements Comparator<ChannelClientInfo>,
         this.sortByCase = newSortByCase;
     }
 
-    /**
-     * Compares two ChannelClient objects based on the settings the comparator was initialised with.
-     *
-     * @param client1 the first client to be compared
-     * @param client2 the second client to be compared
-     *
-     * @return a negative integer, zero, or a positive integer as the first argument is less than,
-     *         equal to, or greater than the second.
-     */
     @Override
-    public int compare(final ChannelClientInfo client1,
-            final ChannelClientInfo client2) {
+    public int compare(final GroupChatUser client1, final GroupChatUser client2) {
+        ComparisonChain comparisonChain = ComparisonChain.start();
         if (sortByMode) {
-            final int modeCom = client2.compareTo(client1);
-
-            if (modeCom != 0) {
-                return modeCom;
-            }
+            comparisonChain = comparisonChain
+                    .compare(client1.getImportantMode(), client2.getImportantMode());
         }
-
-        final String nickname1 = client1.getClient().getNickname();
-        final String nickname2 = client2.getClient().getNickname();
-
         if (sortByCase) {
-            return nickname1.compareTo(nickname2);
+            comparisonChain = comparisonChain.compare(client1.getNickname(), client2.getNickname());
         } else {
-            return nickname1.compareToIgnoreCase(nickname2);
+            comparisonChain = comparisonChain
+                    .compare(client1.getNickname().toLowerCase(),
+                            client2.getNickname().toLowerCase());
         }
+        return comparisonChain.result();
     }
 
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,13 +34,13 @@ import java.util.List;
 import javax.swing.AbstractListModel;
 
 /** Stores and provides means to modify nicklist data for a channel. */
-public final class NicklistListModel extends AbstractListModel<ChannelClientInfo> implements
+public final class NicklistListModel extends AbstractListModel<GroupChatUser> implements
         ConfigChangeListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** stores the nicknames to be shown in this list. */
-    private final List<ChannelClientInfo> nicknames;
+    private final List<GroupChatUser> nicknames;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Sort by mode? */
@@ -54,8 +54,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      * @param config Config manager
      */
     public NicklistListModel(final AggregateConfigProvider config) {
-        this(config, Collections.synchronizedList(
-                new ArrayList<>()));
+        this(config, Collections.synchronizedList(new ArrayList<>()));
     }
 
     /**
@@ -65,7 +64,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      * @param newNicknames list of nicknames used for initialisation
      */
     public NicklistListModel(final AggregateConfigProvider config,
-            final List<ChannelClientInfo> newNicknames) {
+            final List<GroupChatUser> newNicknames) {
 
         this.config = config;
 
@@ -96,7 +95,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      * @return nicklist entry requested
      */
     @Override
-    public ChannelClientInfo getElementAt(final int index) {
+    public GroupChatUser getElementAt(final int index) {
         return nicknames.get(index);
     }
 
@@ -105,8 +104,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      */
     public void sort() {
         synchronized (nicknames) {
-            Collections.sort(nicknames,
-                    new NicklistComparator(sortByMode, sortByCase));
+            Collections.sort(nicknames, new NicklistComparator(sortByMode, sortByCase));
         }
         rerender();
     }
@@ -118,7 +116,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      *
      * @return boolean success
      */
-    public boolean replace(final Collection<ChannelClientInfo> clients) {
+    public boolean replace(final Collection<GroupChatUser> clients) {
         nicknames.clear();
         nicknames.addAll(clients);
         sort();
@@ -133,7 +131,7 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      *
      * @return boolean success
      */
-    public boolean add(final ChannelClientInfo client) {
+    public boolean add(final GroupChatUser client) {
         nicknames.add(client);
         sort();
 
@@ -147,10 +145,9 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      *
      * @return boolean success
      */
-    public boolean remove(final ChannelClientInfo client) {
-        final boolean returnValue;
+    public boolean remove(final GroupChatUser client) {
 
-        returnValue = nicknames.remove(client);
+        final boolean returnValue = nicknames.remove(client);
         rerender();
 
         return returnValue;
@@ -163,10 +160,9 @@ public final class NicklistListModel extends AbstractListModel<ChannelClientInfo
      *
      * @return ChannelClientInfo client removed
      */
-    public ChannelClientInfo remove(final int index) {
-        final ChannelClientInfo returnValue;
+    public GroupChatUser remove(final int index) {
 
-        returnValue = nicknames.remove(index);
+        final GroupChatUser returnValue = nicknames.remove(index);
         rerender();
 
         return returnValue;

ui_swing/src/com/dmdirc/addons/ui_swing/components/renderers/NicklistRenderer.java

@@ -22,27 +22,23 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.colours.Colour;
 
 import java.awt.Color;
-import java.awt.Component;
-import java.util.Map;
 
-import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.ListCellRenderer;
 
 /** Renders the nicklist. */
-public final class NicklistRenderer extends DefaultListCellRenderer {
+public final class NicklistRenderer extends DMDircListCellRenderer<GroupChatUser> {
 
-    /** A version number for this class. */
-    private static final long serialVersionUID = 5;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Nicklist alternate background colour. */
@@ -50,7 +46,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer {
     /** Show nick colours. */
     private boolean showColours;
     /** The list that we're using for the nicklist. */
-    private final JList<ChannelClientInfo> nicklist;
+    private final JList<GroupChatUser> nicklist;
     /** Colour manager to use to resolve colours. */
     private final ColourManager colourManager;
 
@@ -61,10 +57,11 @@ public final class NicklistRenderer extends DefaultListCellRenderer {
      * @param nicklist      The nicklist that we're rendering for.
      * @param colourManager Colour manager to use to resolve colours.
      */
-    public NicklistRenderer(
+    public NicklistRenderer(final ListCellRenderer<? super GroupChatUser> renderer,
             final AggregateConfigProvider config,
-            final JList<ChannelClientInfo> nicklist,
+            final JList<GroupChatUser> nicklist,
             final ColourManager colourManager) {
+        super(renderer);
         this.config = config;
         this.nicklist = nicklist;
         this.colourManager = colourManager;
@@ -72,32 +69,18 @@ public final class NicklistRenderer extends DefaultListCellRenderer {
     }
 
     @Override
-    public Component getListCellRendererComponent(final JList<?> list,
-            final Object value, final int index, final boolean isSelected,
-            final boolean cellHasFocus) {
-
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
-
+    protected void renderValue(final JLabel label, final GroupChatUser value, final int index,
+            final boolean isSelected, final boolean hasFocus) {
         if (!isSelected && (index & 1) == 1) {
-            setBackground(altBackgroundColour);
+            label.setBackground(altBackgroundColour);
         }
-
-        final Map<?, ?> map = ((ChannelClientInfo) value).getMap();
-
-        if (showColours && map != null) {
-            if (map.containsKey(ChannelClientProperty.NICKLIST_FOREGROUND)) {
-                setForeground(UIUtilities.convertColour((Colour) map.get(
-                        ChannelClientProperty.NICKLIST_FOREGROUND)));
-            }
-
-            if (map.containsKey(ChannelClientProperty.NICKLIST_BACKGROUND)) {
-                setBackground(UIUtilities.convertColour((Colour) map.get(
-                        ChannelClientProperty.NICKLIST_BACKGROUND)));
-            }
+        if (showColours) {
+            value.getDisplayProperty(DisplayProperty.FOREGROUND_COLOUR).ifPresent(
+                    c -> label.setForeground(UIUtilities.convertColour(c)));
+            value.getDisplayProperty(DisplayProperty.BACKGROUND_COLOUR).ifPresent(
+                    c -> label.setForeground(UIUtilities.convertColour(c)));
         }
-
-        return this;
+        label.setText(value.getImportantMode() + value.getNickname());
     }
 
     @ConfigBinding(domain = "ui", key = "shownickcoloursinnicklist",
@@ -115,5 +98,4 @@ public final class NicklistRenderer extends DefaultListCellRenderer {
                 colourManager.getColourFromString(value, null));
         nicklist.repaint();
     }
-
 }