Make CHANTYPES handling somewhat sane.

Get rid of weird round-the-houses method of processing, and avoid
duplicating the value in a map and a field.

This fixes our handling of servers doing really stupid, theoretical
things like resetting the CHANTYPES they support. (And by "fixes"
I mean the parser will keep state, while everything else burns
around it.)

Change-Id: Ie4936f21e68e4bb1134e9be3f16932eef4ab086f
Reviewed-on: http://gerrit.dmdirc.com/2831
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -679,9 +679,6 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
 
         post005 = true;
 
-        if (!h005Info.containsKey("CHANTYPES")) {
-            parseChanPrefix();
-        }
         if (!h005Info.containsKey("PREFIX")) {
             parsePrefixModes();
         }
@@ -1665,14 +1662,19 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
     }
 
     /**
-     * Process CHANTYPES from 005.
+     * Resets the channel prefix property to the default, RFC specified value.
      */
-    protected void parseChanPrefix() {
-        if (h005Info.containsKey("CHANTYPES") && !h005Info.get("CHANTYPES").isEmpty()) {
-            chanPrefix = h005Info.get("CHANTYPES");
-        } else {
-            h005Info.put("CHANTYPES", DEFAULT_CHAN_PREFIX);
-        }
+    protected void resetChanPrefix() {
+        chanPrefix = DEFAULT_CHAN_PREFIX;
+    }
+
+    /**
+     * Sets the set of possible channel prefixes to those in the given value.
+     *
+     * @param value The new set of channel prefixes.
+     */
+    protected void setChanPrefix(final String value) {
+        chanPrefix = value;
     }
 
     /**
@@ -1745,15 +1747,12 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
                     list.append(',');
                 }
                 if (!isValidChannelName(channel.getName())) {
-                    if (h005Info.containsKey("CHANTYPES")) {
-                        final String chantypes = h005Info.get("CHANTYPES");
-                        if (chantypes.isEmpty()) {
-                            list.append('#');
-                        } else {
-                            list.append(chantypes.charAt(0));
-                        }
-                    } else {
+                    if (chanPrefix.isEmpty()) {
+                        // TODO: This is wrong - empty chan prefix means the
+                        // IRCd supports no channels.
                         list.append('#');
+                    } else {
+                        list.append(chanPrefix.charAt(0));
                     }
                 }
                 list.append(channel.getName());

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

@@ -182,7 +182,7 @@ public class Process004005 extends IRCProcessor {
                     processCaseMappingToken(isNegation, value);
                     break;
                 case "CHANTYPES":
-                    processChanTypesToken();
+                    processChanTypesToken(isNegation, value);
                     break;
                 case "PREFIX":
                     processPrefixToken();
@@ -252,9 +252,16 @@ public class Process004005 extends IRCProcessor {
 
     /**
      * Processes a 'CHANTYPES' token received in a 005.
+     *
+     * @param isNegation Whether the token was negated or not.
+     * @param value The value of the token.
      */
-    private void processChanTypesToken() {
-        parser.parseChanPrefix();
+    private void processChanTypesToken(final boolean isNegation, final String value) {
+        if (isNegation) {
+            parser.resetChanPrefix();
+        } else {
+            parser.setChanPrefix(value);
+        }
     }
 
     /**