Rename cmodes -> Membership, make add/remove user functions accept User

diff --git a/acid/src/main/java/net/rizon/acid/core/AcidUser.java b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
index 6279caa851e0fe4011e12f1aacc107d5803a6a3c..f31e25bbf785efd619e4ba930c3eba5ef8939598 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/AcidUser.java
+++ b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
@@ -49,7 +49,7 @@ public class AcidUser extends User
                }
                if (!Acidictive.me.isBursting())
                        Protocol.join(this, chan);
-               chan.addUser(this.getNick(), "");
+               chan.addUser(this, "");
                this.addChan(chan);
        }
        
@@ -59,7 +59,7 @@ public class AcidUser extends User
                        return;
                
                Protocol.part(this, chan.getName());
-               chan.removeUser(this.getNick());
+               chan.removeUser(this);
                this.remChan(chan);
        }
        

diff --git a/acid/src/main/java/net/rizon/acid/core/Channel.java b/acid/src/main/java/net/rizon/acid/core/Channel.java
index 5d3f47f1c62e01e743f6df8b9819fee6202b2e5c..ac58a7b1d72d9f096cb48c6ddb005adc8108d0ef 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Channel.java
+++ b/acid/src/main/java/net/rizon/acid/core/Channel.java
@@ -13,7 +13,7 @@ public class Channel
        private int ts;
        private String channel;
        // User list: nick => channel user status modes. TreeMap auto-sorts keys
-       private TreeMap<String, CModes> list = new TreeMap<String, CModes>();
+       private TreeMap<String, Membership> list = new TreeMap<String, Membership>();
        private String modes = "";
        private String key;
        private int limit;
@@ -36,21 +36,21 @@ public class Channel
                return list.keySet();
        }
 
-       public void addUser(String nick, String modes)
+       public void addUser(User user, String modes)
        {
-               list.put(nick.toLowerCase(), new CModes(modes));
+               list.put(user.getNick().toLowerCase(), new Membership(user, this, modes));
        }
 
-       public void removeUser(String nick)
+       public void removeUser(User user)
        {
-               list.remove(nick.toLowerCase());
+               list.remove(user.getNick().toLowerCase());
                if (list.isEmpty() && !hasMode('z'))
                        this.destroy();
        }
 
        public void setMode(String nick, String mode)
        {
-               CModes user = list.get(nick.toLowerCase());
+               Membership user = list.get(nick.toLowerCase());
                if (user != null)
                {
                        user.addMode(mode);
@@ -59,7 +59,7 @@ public class Channel
 
        public void remMode(String nick, String mode)
        {
-               CModes user = list.get(nick.toLowerCase());
+               Membership user = list.get(nick.toLowerCase());
                if (user != null)
                {
                        user.remMode(mode);
@@ -81,7 +81,7 @@ public class Channel
                log.log(Level.FINE, "Lowering TS of " + channel + " from " + this.ts + " to " + ts);
                
                this.ts = ts;
-               for (CModes cm : list.values())
+               for (Membership cm : list.values())
                        cm.clear();
                this.modes = "";
                this.key = null;
@@ -153,7 +153,7 @@ public class Channel
 
        public String getModes(String nick)
        {
-               CModes user = list.get(nick.toLowerCase());
+               Membership user = list.get(nick.toLowerCase());
                if (user != null)
                {
                        return user.getModes();
@@ -163,7 +163,7 @@ public class Channel
 
        public void onNick(String oldnick, String newnick)
        {
-               CModes user = list.get(oldnick.toLowerCase());
+               Membership user = list.get(oldnick.toLowerCase());
                if (user != null)
                {
                        list.remove(oldnick.toLowerCase());
@@ -182,7 +182,7 @@ public class Channel
                ArrayList<String> hops = new ArrayList<String>();
                ArrayList<String> voices = new ArrayList<String>();
                ArrayList<String> regs = new ArrayList<String>();
-               CModes modes;
+               Membership modes;
                User user;
                for (String s : list.keySet())
                {

diff --git a/acid/src/main/java/net/rizon/acid/core/CModes.java b/acid/src/main/java/net/rizon/acid/core/Membership.java
similarity index 91%
rename from acid/src/main/java/net/rizon/acid/core/CModes.java
rename to acid/src/main/java/net/rizon/acid/core/Membership.java
index 6c155b4b65d4c1e8e5efcd2161c1a813b844f557..fe7215dc9a3abf5f3f7b5a6d20da2d895a348db7 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/CModes.java
+++ b/acid/src/main/java/net/rizon/acid/core/Membership.java
@@ -1,11 +1,15 @@
 package net.rizon.acid.core;
 
-public class CModes
+public class Membership
 {
+       public User user;
+       public Channel channel;
        public String modes = "";
 
-       public CModes(String modes)
+       public Membership(User user, Channel channel, String modes)
        {
+               this.user = user;
+               this.channel = channel;
                if (modes == null)
                        this.modes = "";
                else

diff --git a/acid/src/main/java/net/rizon/acid/core/User.java b/acid/src/main/java/net/rizon/acid/core/User.java
index e4933888d9d812cfd4ccf466dbc47fe6a2bca761..41370c0a0de12d04eb66108909a469994a185809 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/User.java
+++ b/acid/src/main/java/net/rizon/acid/core/User.java
@@ -61,7 +61,7 @@ public class User implements Comparable<User>
                for (Iterator<Channel> it = chanList.iterator(); it.hasNext();)
                {
                        Channel chan = it.next();
-                       chan.removeUser(this.getNick());
+                       chan.removeUser(this);
                        it.remove();
                }
 

diff --git a/acid/src/main/java/net/rizon/acid/messages/Join.java b/acid/src/main/java/net/rizon/acid/messages/Join.java
index 2d52f7ca678eba13f6d6a5074f1e73ab823cf8e9..5a8e95962cb66e11b3f896e8601aeabe413e9bb0 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/Join.java
+++ b/acid/src/main/java/net/rizon/acid/messages/Join.java
@@ -23,7 +23,7 @@ public class Join extends Message
                if (chan == null)
                        chan = new Channel(channel, Integer.parseInt(ts));
 
-               chan.addUser(u.getNick(), "");
+               chan.addUser(u, "");
                u.addChan(chan);
 
                User[] user = new User[1];

diff --git a/acid/src/main/java/net/rizon/acid/messages/Kick.java b/acid/src/main/java/net/rizon/acid/messages/Kick.java
index 87d0798f3d935eef6f6aff34cdf4064b8eaff463..6a4fbcd4ccaf5cfc6dad4672f210b2cc2dc381c9 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/Kick.java
+++ b/acid/src/main/java/net/rizon/acid/messages/Kick.java
@@ -42,7 +42,7 @@ public class Kick extends Message
                        return;
                }
 
-               chan.removeUser(kickee.getNick());
+               chan.removeUser(kickee);
                kickee.remChan(chan);
 
                Acidictive.onKick(kicker, kickee, channel, params[2]);

diff --git a/acid/src/main/java/net/rizon/acid/messages/Part.java b/acid/src/main/java/net/rizon/acid/messages/Part.java
index 004b6183a2cf27d9d136a5f4a5703774d21199dc..19f266b9e91b8f650906a8c31a722746ebe77833 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/Part.java
+++ b/acid/src/main/java/net/rizon/acid/messages/Part.java
@@ -27,7 +27,7 @@ public class Part extends Message
                        return;
                }
 
-               chan.removeUser(u.getNick());
+               chan.removeUser(u);
                u.remChan(chan);
 
                Acidictive.onPart(u.getNick(), chan.getName());

diff --git a/acid/src/main/java/net/rizon/acid/messages/SJoin.java b/acid/src/main/java/net/rizon/acid/messages/SJoin.java
index 021a649ca50776882f89073f2576e1392c81c0b6..75c351ef202cb9ee2ca0c54b11e7cca7f9d11c3f 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/SJoin.java
+++ b/acid/src/main/java/net/rizon/acid/messages/SJoin.java
@@ -86,7 +86,7 @@ public class SJoin extends Message
 
                        if (users[i] != null)
                        {
-                               chan.addUser(users[i].getNick(), keep_their_modes ? getModes(u[i]) : "");
+                               chan.addUser(users[i], keep_their_modes ? getModes(u[i]) : "");
                                users[i].addChan(chan);
                        }
                        else