Iterate over the characters of a String like a sane person.

diff --git a/src/main/java/net/pterodactylus/irc/util/MessageCleaner.java b/src/main/java/net/pterodactylus/irc/util/MessageCleaner.java
index 4b91e4a..160811e 100644 (file)
--- a/src/main/java/net/pterodactylus/irc/util/MessageCleaner.java
+++ b/src/main/java/net/pterodactylus/irc/util/MessageCleaner.java
@@ -21,8 +21,6 @@ import static net.pterodactylus.irc.util.MessageCleaner.Attributes.italics;
 import static net.pterodactylus.irc.util.MessageCleaner.Attributes.reverse;
 import static net.pterodactylus.irc.util.MessageCleaner.Attributes.underline;
 
-import java.io.IOException;
-import java.io.StringReader;
 import java.util.EnumSet;
 import java.util.Set;
 
@@ -71,101 +69,90 @@ public class MessageCleaner {
        public String clean(String line, Set<Attributes> attributes) {
                StringBuilder clean = new StringBuilder(line.length());
 
-               StringReader reader = new StringReader(line);
-
-               try {
-                       int inColorCode = 0;
-                       while (true) {
-                               int r = reader.read();
-                               if (r == -1) {
-                                       break;
-                               }
-                               char c = (char) r;
-                               if ((c == 2) && (attributes.contains(Attributes.bold))) {
-                                       continue;
-                               }
-                               if ((c == 3) && (attributes.contains(Attributes.color))) {
-                                       inColorCode = 1;
-                                       continue;
-                               }
-                               if ((c == 15) && (attributes.contains(Attributes.clear))) {
-                                       continue;
-                               }
-                               if ((c == 22) && attributes.contains(reverse)) {
-                                       continue;
-                               }
-                               if ((c == 29) && attributes.contains(italics)) {
-                                       continue;
-                               }
-                               if ((c == 31) && attributes.contains(underline)) {
-                                       continue;
-                               }
-                               if (inColorCode > 0) {
-                                       if (inColorCode == 1) {
-                                               if ((c < '0') || (c > '9')) {
-                                                       inColorCode = 0;
-                                               } else {
-                                                       if (c == '9') {
-                                                               inColorCode = 8;
-                                                       } else {
-                                                               ++inColorCode;
-                                                       }
-                                                       continue;
-                                               }
-                                       } else if (inColorCode == 2) {
-                                               if (c == ',') {
-                                                       inColorCode = 4;
-                                                       continue;
-                                               }
-                                               if ((c < '0') || (c > '5')) {
-                                                       inColorCode = 0;
-                                               } else {
-                                                       ++inColorCode;
-                                                       continue;
-                                               }
-                                       } else if (inColorCode == 3) {
-                                               if (c == ',') {
-                                                       ++inColorCode;
-                                                       continue;
-                                               } else {
-                                                       inColorCode = 0;
-                                               }
-                                       } else if (inColorCode == 4) {
+               int inColorCode = 0;
+               for (char c : line.toCharArray()) {
+                       if ((c == 2) && (attributes.contains(Attributes.bold))) {
+                               continue;
+                       }
+                       if ((c == 3) && (attributes.contains(Attributes.color))) {
+                               inColorCode = 1;
+                               continue;
+                       }
+                       if ((c == 15) && (attributes.contains(Attributes.clear))) {
+                               continue;
+                       }
+                       if ((c == 22) && attributes.contains(reverse)) {
+                               continue;
+                       }
+                       if ((c == 29) && attributes.contains(italics)) {
+                               continue;
+                       }
+                       if ((c == 31) && attributes.contains(underline)) {
+                               continue;
+                       }
+                       if (inColorCode > 0) {
+                               if (inColorCode == 1) {
+                                       if ((c < '0') || (c > '9')) {
+                                               inColorCode = 0;
+                                       } else {
                                                if (c == '9') {
-                                                       inColorCode = 9;
-                                                       continue;
-                                               } else if ((c < '0') || (c > '9')) {
-                                                       inColorCode = 0;
+                                                       inColorCode = 8;
                                                } else {
                                                        ++inColorCode;
-                                                       continue;
                                                }
-                                       } else if (inColorCode == 5) {
+                                               continue;
+                                       }
+                               } else if (inColorCode == 2) {
+                                       if (c == ',') {
+                                               inColorCode = 4;
+                                               continue;
+                                       }
+                                       if ((c < '0') || (c > '5')) {
                                                inColorCode = 0;
-                                               if ((c >= '0') && (c <= '5')) {
-                                                       continue;
-                                               }
-                                       } else if (inColorCode == 8) {
-                                               if (c == '9') {
-                                                       inColorCode = 3;
-                                                       continue;
-                                               } else if (c == ',') {
-                                                       inColorCode = 4;
-                                                       continue;
-                                               } else {
-                                                       inColorCode = 0;
-                                               }
+                                       } else {
+                                               ++inColorCode;
+                                               continue;
+                                       }
+                               } else if (inColorCode == 3) {
+                                       if (c == ',') {
+                                               ++inColorCode;
+                                               continue;
                                        } else {
                                                inColorCode = 0;
-                                               if (c == '9') {
-                                                       continue;
-                                               }
+                                       }
+                               } else if (inColorCode == 4) {
+                                       if (c == '9') {
+                                               inColorCode = 9;
+                                               continue;
+                                       } else if ((c < '0') || (c > '9')) {
+                                               inColorCode = 0;
+                                       } else {
+                                               ++inColorCode;
+                                               continue;
+                                       }
+                               } else if (inColorCode == 5) {
+                                       inColorCode = 0;
+                                       if ((c >= '0') && (c <= '5')) {
+                                               continue;
+                                       }
+                               } else if (inColorCode == 8) {
+                                       if (c == '9') {
+                                               inColorCode = 3;
+                                               continue;
+                                       } else if (c == ',') {
+                                               inColorCode = 4;
+                                               continue;
+                                       } else {
+                                               inColorCode = 0;
+                                       }
+                               } else {
+                                       inColorCode = 0;
+                                       if (c == '9') {
+                                               continue;
                                        }
                                }
-                               clean.append(c);
                        }
-               } catch (IOException ioe1) {
-                       /* StringReader will never throw. */
+                       clean.append(c);
                }
 
                return clean.toString();