refactor 591

fishercoder1534 · fishercoder1534 · commit 0c8eefcd3d27 · 2019-07-19T07:12:31.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_591.java b/src/main/java/com/fishercoder/solutions/_591.java
@@ -100,54 +100,59 @@ For simplicity, you could assume the input code (including the any characters me
  only contain letters, digits, '<','>','/','!','[',']' and ' '.
  */
 public class _591 {
-
-    /**Credit: https://discuss.leetcode.com/topic/91300/java-solution-use-startswith-and-indexof*/
-    public boolean isValid(String code) {
-        Deque<String> stack = new ArrayDeque<>();
-        for (int i = 0; i < code.length(); ) {
-            if (i > 0 && stack.isEmpty()) {
-                return false;
-            }
-            if (code.startsWith("<![CDATA[", i)) {
-                int j = i + 9;//"<![CDATA[" length is 9
-                i = code.indexOf("]]>", j);
-                if (i < 0) {
-                    return false;
-                }
-                i += 3;//"]]>" length is 3
-            } else if (code.startsWith("</", i)) {
-                int j = i + 2;
-                i = code.indexOf(">", j);
-                if (i < 0 || i == j || i - j > 9) {
+    
+    public static class Solution1 {
+
+        /**
+         * Credit: https://discuss.leetcode.com/topic/91300/java-solution-use-startswith-and-indexof
+         */
+        public boolean isValid(String code) {
+            Deque<String> stack = new ArrayDeque<>();
+            for (int i = 0; i < code.length(); ) {
+                if (i > 0 && stack.isEmpty()) {
                     return false;
                 }
-                for (int k = j; k < i; k++) {
-                    if (!Character.isUpperCase(code.charAt(k))) {
+                if (code.startsWith("<![CDATA[", i)) {
+                    int j = i + 9;//"<![CDATA[" length is 9
+                    i = code.indexOf("]]>", j);
+                    if (i < 0) {
                         return false;
                     }
-                }
-                String s = code.substring(j, i++);
-                if (stack.isEmpty() || !stack.pop().equals(s)) {
-                    return false;
-                }
-            } else if (code.startsWith("<", i)) {
-                int j = i + 1;
-                i = code.indexOf(">", j);
-                if (i < 0 || i == j || i - j > 9) {
-                    return false;
-                }
-                for (int k = j; k < i; k++) {
-                    if (!Character.isUpperCase(code.charAt(k))) {
+                    i += 3;//"]]>" length is 3
+                } else if (code.startsWith("</", i)) {
+                    int j = i + 2;
+                    i = code.indexOf(">", j);
+                    if (i < 0 || i == j || i - j > 9) {
+                        return false;
+                    }
+                    for (int k = j; k < i; k++) {
+                        if (!Character.isUpperCase(code.charAt(k))) {
+                            return false;
+                        }
+                    }
+                    String s = code.substring(j, i++);
+                    if (stack.isEmpty() || !stack.pop().equals(s)) {
                         return false;
                     }
+                } else if (code.startsWith("<", i)) {
+                    int j = i + 1;
+                    i = code.indexOf(">", j);
+                    if (i < 0 || i == j || i - j > 9) {
+                        return false;
+                    }
+                    for (int k = j; k < i; k++) {
+                        if (!Character.isUpperCase(code.charAt(k))) {
+                            return false;
+                        }
+                    }
+                    String s = code.substring(j, i++);
+                    stack.push(s);
+                } else {
+                    i++;
                 }
-                String s = code.substring(j, i++);
-                stack.push(s);
-            } else {
-                i++;
             }
+            return stack.isEmpty();
         }
-        return stack.isEmpty();
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_591Test.java b/src/test/java/com/fishercoder/_591Test.java
@@ -7,11 +7,11 @@
 import static org.junit.Assert.assertEquals;
 
 public class _591Test {
-    private static _591 test;
+    private static _591.Solution1 test;
 
     @BeforeClass
     public static void setup() {
-        test = new _591();
+        test = new _591.Solution1();
     }
 
     @Test
