Use a ModeManager for boolean chan modes.

Change-Id: Ie4986e34e3408a8906c99b0c318ccbe58c8d5019
Reviewed-on: http://gerrit.dmdirc.com/3964
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/parser/interfaces/Parser.java

@@ -308,7 +308,7 @@ public interface Parser {
     int getMaxTopicLength();
 
     /**
-     * Retrieves an alphabetically-sorted list of boolean channel modes.
+     * Retrieves a list of boolean channel modes.
      * Boolean channel modes may only be set or unset, and do not take any
      * arguments.
      *

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -61,7 +61,7 @@ public class IRCChannelInfo implements ChannelInfo {
     /** Has this channel ever had a topic? */
     private boolean hadTopic;
     /** Known boolean-modes for channel. */
-    private long modes;
+    private String modes;
     /** Reference to the parser object that owns this channel, Used for modes. */
     private final IRCParser parser; // Reference to parser object that owns this channel. Used for Modes
     /** Channel Name. */
@@ -76,9 +76,9 @@ public class IRCChannelInfo implements ChannelInfo {
      * LinkedList storing status of mode adding.
      * if an item is in this list for a mode, we are expecting new items for the list
      */
-    private final List<Character> addingModes = new LinkedList<>();
+    private final Collection<Character> addingModes = new LinkedList<>();
     /** Modes waiting to be sent to the server. */
-    private final List<String> modeQueue = new LinkedList<>();
+    private final Collection<String> modeQueue = new LinkedList<>();
     /** A Map to allow applications to attach misc data to this object. */
     private final Map<Object, Object> map;
     /** Queue of requested list modes. */
@@ -426,20 +426,20 @@ public class IRCChannelInfo implements ChannelInfo {
     }
 
     /**
-     * Set the channel modes (as an integer).
+     * Set the channel modes.
      *
-     * @param nNewMode new long representing channel modes. (Boolean only)
+     * @param nNewMode new boolean channel modes
      */
-    public void setMode(final long nNewMode) {
+    public void setMode(final String nNewMode) {
         modes = nNewMode;
     }
 
     /**
-     * Get the channel modes (as an integer).
+     * Get the channel modes.
      *
-     * @return long representing channel modes. (Boolean only)
+     * @return the boolean channel modes.
      */
-    public long getMode() {
+    public String getMode() {
         return modes;
     }
 
@@ -447,17 +447,9 @@ public class IRCChannelInfo implements ChannelInfo {
     public String getModes() {
         final StringBuilder sModes = new StringBuilder("+");
         final StringBuilder sModeParams = new StringBuilder();
-        String sTemp;
-        long nTemp;
-        final long nChanModes = this.getMode();
-        for (char cTemp : parser.chanModesBool.keySet()) {
-            nTemp = parser.chanModesBool.get(cTemp);
-            if ((nChanModes & nTemp) == nTemp) {
-                sModes.append(cTemp);
-            }
-        }
+        sModes.append(modes);
         for (char cTemp : paramModes.keySet()) {
-            sTemp = paramModes.get(cTemp);
+            final String sTemp = paramModes.get(cTemp);
             if (!sTemp.isEmpty()) {
                 sModes.append(cTemp);
                 sModeParams.append(' ').append(this.getMode(cTemp));
@@ -613,7 +605,7 @@ public class IRCChannelInfo implements ChannelInfo {
         }
 
         modestr = (add ? "+" : "-") + mode;
-        if (parser.chanModesBool.containsKey(mode)) {
+        if (parser.chanModesBool.isMode(mode)) {
             final String teststr = (add ? "-" : "+") + mode;
             if (modeQueue.contains(teststr)) {
                 modeQueue.remove(teststr);
@@ -629,9 +621,9 @@ public class IRCChannelInfo implements ChannelInfo {
                 modeint = parser.chanModesOther.get(mode);
                 if ((modeint & IRCParser.MODE_LIST) == IRCParser.MODE_LIST) {
                     modestr = modestr + " " + parameter;
-                } else if (!add && ((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) {
+                } else if (!add && (modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
                     modestr = modestr + " " + parameter;
-                } else if (add && ((modeint & IRCParser.MODE_SET) == IRCParser.MODE_SET)) {
+                } else if (add && (modeint & IRCParser.MODE_SET) == IRCParser.MODE_SET) {
                     // Does mode require a param to unset aswell?
                     // We might need to queue an unset first
                     if ((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {

src/com/dmdirc/parser/irc/IRCParser.java

@@ -171,16 +171,11 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     /** Manager used to handle user modes (owxis etc). */
     public final ModeManager userModes = new ModeManager();
     /**
-     * Hashtable storing known boolean chan modes (cntmi etc).
-     * Valid Boolean Modes are stored as Hashtable.pub('m',1); where 'm' is the mode and 1 is a numeric value.<br><br>
-     * Numeric values are powers of 2. This allows up to 32 modes at present (expandable to 64)<br><br>
-     * ChannelInfo/ChannelClientInfo etc provide methods to view the modes in a human way.<br><br>
-     * <br>
+     * Manager used to handle channel boolean modes.
+     * <p>
      * Channel modes discovered but not listed in 005 are stored as boolean modes automatically (and a ERROR_WARNING Error is called)
      */
-    public final Map<Character, Long> chanModesBool = new HashMap<>();
-    /** Integer representing the next avaliable integer value of a Boolean mode. */
-    public long nextKeyCMBool = 1;
+    public final ModeManager chanModesBool = new ModeManager();
     /**
      * Hashtable storing known non-boolean chan modes (klbeI etc).
      * Non Boolean Modes (for Channels) are stored together in this hashtable, the value param
@@ -712,8 +707,6 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
         if (out != null) {
             out.clearQueue();
         }
-        // Reset the mode indexes
-        nextKeyCMBool = 1;
         setServerName("");
         networkName = "";
         lastLine = null;
@@ -1523,8 +1516,6 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
 
         // resetState
         chanModesOther.clear();
-        chanModesBool.clear();
-        nextKeyCMBool = 1;
 
         // List modes.
         for (int i = 0; i < bits[0].length(); ++i) {
@@ -1555,14 +1546,8 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
         }
 
         // Boolean Mode
-        for (int i = 0; i < bits[3].length(); ++i) {
-            final Character cMode = bits[3].charAt(i);
-            callDebugInfo(DEBUG_INFO, "Found Boolean Mode: %c [%d]", cMode, nextKeyCMBool);
-            if (!chanModesBool.containsKey(cMode)) {
-                chanModesBool.put(cMode, nextKeyCMBool);
-                nextKeyCMBool *= 2;
-            }
-        }
+        chanModesBool.set(bits[3]);
+        callDebugInfo(DEBUG_INFO, "Found boolean modes: %s", bits[3]);
     }
 
     @Override
@@ -1572,15 +1557,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
 
     @Override
     public String getBooleanChannelModes() {
-        final char[] modes = new char[chanModesBool.size()];
-        int i = 0;
-        for (char mode : chanModesBool.keySet()) {
-            modes[i] = mode;
-            i++;
-        }
-        // Alphabetically sort the array
-        Arrays.sort(modes);
-        return new String(modes);
+        return chanModesBool.getModes();
     }
 
     @Override

src/com/dmdirc/parser/irc/processors/ProcessMode.java

@@ -115,7 +115,7 @@ public class ProcessMode extends IRCProcessor {
         String sModeParam;
         String sTemp;
         int nParam = 1;
-        long nTemp, nValue, nCurrent = 0;
+        long nTemp, nValue = 0;
         boolean bPositive = true, bBooleanMode;
         char cPositive = '+';
         final IRCChannelInfo iChannel;
@@ -135,6 +135,7 @@ public class ProcessMode extends IRCProcessor {
             return;
         }
         // Get the current channel modes
+        String nCurrent = "";
         if (!"324".equals(sParam)) {
             nCurrent = iChannel.getMode();
         }
@@ -160,8 +161,7 @@ public class ProcessMode extends IRCProcessor {
                 cPositive = '-';
                 bPositive = false;
             } else {
-                if (parser.chanModesBool.containsKey(cMode)) {
-                    nValue = parser.chanModesBool.get(cMode);
+                if (parser.chanModesBool.isMode(cMode)) {
                     bBooleanMode = true;
                 } else if (parser.chanModesOther.containsKey(cMode)) {
                     nValue = parser.chanModesOther.get(cMode);
@@ -196,19 +196,17 @@ public class ProcessMode extends IRCProcessor {
                     continue;
                 } else {
                     // unknown mode - add as boolean
-                    parser.chanModesBool.put(cMode, parser.nextKeyCMBool);
-                    nValue = parser.nextKeyCMBool;
+                    parser.chanModesBool.add(cMode);
                     bBooleanMode = true;
-                    parser.nextKeyCMBool *= 2;
                 }
 
                 if (bBooleanMode) {
-                    callDebugInfo(IRCParser.DEBUG_INFO, "Boolean Mode: %c [%d] {Positive: %b}", cMode, nValue, bPositive);
+                    callDebugInfo(IRCParser.DEBUG_INFO, "Boolean Mode: %c {Positive: %b}", cMode, bPositive);
 
                     if (bPositive) {
-                        nCurrent |= nValue;
+                        nCurrent = parser.chanModesBool.insertMode(nCurrent, cMode);
                     } else {
-                        nCurrent ^= nCurrent & nValue;
+                        nCurrent = parser.chanModesBool.removeMode(nCurrent, cMode);
                     }
                 } else {