Simplify some parser logic relating to prefix modes.

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

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

@@ -370,7 +370,7 @@ public interface Parser {
     String getUserModes();
 
     /**
-     * Retrieves a list of channel user modes, in descending priority order.
+     * Retrieves a list of channel user modes, in ascending priority order.
      *
      * @return A string containing a list of channel user mode characters
      */

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

@@ -1569,11 +1569,7 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
 
     @Override
     public String getChannelUserModes() {
-        if (h005Info.containsKey("PREFIXSTRING")) {
-            return h005Info.get("PREFIXSTRING");
-        } else {
-            return "";
-        }
+        return prefixModes.getModes();
     }
 
     @Override
@@ -1690,42 +1686,35 @@ public class IRCParser extends BaseParser implements SecureParser, EncodingParse
      */
     public void parsePrefixModes() {
         final String sDefaultModes = "(ohv)@%+";
-        String[] bits;
         String modeStr;
         if (h005Info.containsKey("PREFIX")) {
             modeStr = h005Info.get("PREFIX");
         } else {
             modeStr = sDefaultModes;
         }
-        if (modeStr.substring(0, 1).equals("(")) {
+        if ("(".equals(modeStr.substring(0, 1))) {
             modeStr = modeStr.substring(1);
         } else {
             modeStr = sDefaultModes.substring(1);
             h005Info.put("PREFIX", sDefaultModes);
         }
 
-        bits = modeStr.split("\\)", 2);
-        if (bits.length != 2 || bits[0].length() != bits[1].length()) {
-            modeStr = sDefaultModes;
-            callErrorInfo(new ParserError(ParserError.ERROR_ERROR, "PREFIX String not valid. Using default string of \"" + modeStr + "\"", getLastLine()));
-            h005Info.put("PREFIX", modeStr);
-            modeStr = modeStr.substring(1);
-            bits = modeStr.split("\\)", 2);
+        int closingIndex = modeStr.indexOf(')');
+        if (closingIndex * 2 + 1 != modeStr.length()) {
+            callErrorInfo(new ParserError(ParserError.ERROR_ERROR,
+                    "PREFIX String not valid. Using default string of \"" + modeStr +
+                    '"', getLastLine()));
+            h005Info.put("PREFIX", sDefaultModes);
+            modeStr = sDefaultModes.substring(1);
+            closingIndex = modeStr.indexOf(')');
         }
 
-        // resetState
-        prefixModes.clear();
-
-        for (int i = bits[0].length() - 1; i > -1; --i) {
-            final Character cMode = bits[0].charAt(i);
-            final Character cPrefix = bits[1].charAt(i);
-            callDebugInfo(DEBUG_INFO, "Found Prefix Mode: %c => %c", cMode, cPrefix);
-            if (!prefixModes.isPrefixMode(cMode)) {
-                prefixModes.add(cMode, cPrefix);
-            }
-        }
+        // The modes passed from the server are in descending order of importance, we want to
+        // store them in ascending, so reverse them:
+        final String reversedModes = new StringBuilder(modeStr).reverse().toString();
 
-        h005Info.put("PREFIXSTRING", bits[0]);
+        prefixModes.setModes(reversedModes.substring(closingIndex + 1),
+                reversedModes.substring(0, closingIndex));
     }
 
     @Override

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

@@ -36,8 +36,18 @@ public class PrefixModeManager {
      * Resets the state of this manager, clearing all known modes.
      */
     public void clear() {
-        modes = "";
-        prefixes = "";
+        setModes("", "");
+    }
+
+    /**
+     * Replaces all existing modes with the specified ones.
+     *
+     * @param modes The new modes, in increasing order of importance.
+     * @param prefixes The corresponding new prefixes, in increasing order of importance.
+     */
+    public void setModes(final String modes, final String prefixes) {
+        this.modes = modes;
+        this.prefixes = prefixes;
     }
 
     /**
@@ -100,7 +110,7 @@ public class PrefixModeManager {
      *
      * @return Set of known modes, in increasing order of importance.
      */
-    public CharSequence getModes() {
+    public String getModes() {
         return modes;
     }
 
@@ -175,4 +185,5 @@ public class PrefixModeManager {
 
         return result.toString();
     }
+
 }