Added ChannelClientProperty, and made Channel objects ensure their clients have proper maps in their misc properties

git-svn-id: http://svn.dmdirc.com/trunk@1078 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/Channel.java

@@ -27,6 +27,7 @@ import java.beans.PropertyVetoException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import javax.swing.ImageIcon;
 import javax.swing.JInternalFrame;
@@ -376,6 +377,16 @@ public final class Channel implements IChannelMessage, IChannelGotNames,
         return frame.equals(target);
     }
     
+    /**
+     * Ensures that a channel client's map is set up correctly.
+     * @param target The ChannelClientInfo to check
+     */
+    private void mapClient(final ChannelClientInfo target) {
+        if (target.getMiscObject() == null) {
+            target.setMiscObject(new HashMap<ChannelClientProperty, Object>());
+        }
+    }
+    
     /**
      * Called whenever a message is sent to this channel. NB that the ChannelClient
      * passed may be null if the message was not sent by a client on the channel
@@ -441,6 +452,7 @@ public final class Channel implements IChannelMessage, IChannelGotNames,
         
         final ArrayList<String> names = new ArrayList<String>();
         for (ChannelClientInfo channelClient : cChannel.getChannelClients()) {
+            mapClient(channelClient);
             names.add(channelClient.getNickname());
         }
         tabCompleter.replaceEntries(names);
@@ -494,6 +506,8 @@ public final class Channel implements IChannelMessage, IChannelGotNames,
         
         final StringBuffer buff = new StringBuffer("channelJoin");
         
+        mapClient(cChannelClient);
+        
         ActionManager.processEvent(CoreActionType.CHANNEL_JOIN, buff, this, cChannelClient);
         
         frame.addLine(buff, "", client.getNickname(), client.getIdent(),

src/uk/org/ownage/dmdirc/ChannelClientProperty.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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 uk.org.ownage.dmdirc;
+
+/**
+ * Represents the properties that can be set on a channel client.
+ * @author chris
+ */
+public enum ChannelClientProperty {
+    
+    COLOUR_FOREGROUND,
+    COLOUR_BACKGROUND;
+    
+}