refactor 604

fishercoder1534 · fishercoder1534 · commit f6cb034887f7 · 2019-07-28T07:49:27.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_604.java b/src/main/java/com/fishercoder/solutions/_604.java
@@ -35,38 +35,40 @@
 
  */
 public class _604 {
-    public static class StringIterator {
+    public static class Solution1 {
+        public static class StringIterator {
 
-        Deque<int[]> deque;
+            Deque<int[]> deque;
 
-        public StringIterator(String compressedString) {
-            deque = new ArrayDeque<>();
-            int len = compressedString.length();
-            int i = 0;
-            while (i < len) {
-                int j = i + 1;
-                while (j < len && Character.isDigit(compressedString.charAt(j))) {
-                    j++;
+            public StringIterator(String compressedString) {
+                deque = new ArrayDeque<>();
+                int len = compressedString.length();
+                int i = 0;
+                while (i < len) {
+                    int j = i + 1;
+                    while (j < len && Character.isDigit(compressedString.charAt(j))) {
+                        j++;
+                    }
+                    deque.addLast(new int[]{compressedString.charAt(i) - 'A', Integer.parseInt(compressedString.substring(i + 1, j))});
+                    i = j;
                 }
-                deque.addLast(new int[]{compressedString.charAt(i) - 'A', Integer.parseInt(compressedString.substring(i + 1, j))});
-                i = j;
             }
-        }
 
-        public char next() {
-            if (deque.isEmpty()) {
-                return ' ';
-            }
-            int[] top = deque.peek();
-            top[1]--;
-            if (top[1] == 0) {
-                deque.pollFirst();
+            public char next() {
+                if (deque.isEmpty()) {
+                    return ' ';
+                }
+                int[] top = deque.peek();
+                top[1]--;
+                if (top[1] == 0) {
+                    deque.pollFirst();
+                }
+                return (char) ('A' + top[0]);
             }
-            return (char) ('A' + top[0]);
-        }
 
-        public boolean hasNext() {
-            return !deque.isEmpty();
+            public boolean hasNext() {
+                return !deque.isEmpty();
+            }
         }
     }
 }
diff --git a/src/test/java/com/fishercoder/_604Test.java b/src/test/java/com/fishercoder/_604Test.java
@@ -6,11 +6,11 @@
 import static org.junit.Assert.assertEquals;
 
 public class _604Test {
-    private static _604.StringIterator test;
+    private static _604.Solution1.StringIterator test;
 
     @Test
     public void test1() {
-        test = new _604.StringIterator("L1e2t1C1o1d1e1");
+        test = new _604.Solution1.StringIterator("L1e2t1C1o1d1e1");
         System.out.println(test.hasNext());
         System.out.println(test.next());
         System.out.println(test.next());
@@ -25,7 +25,7 @@ public void test1() {
 
     @Test
     public void test2() {
-        test = new _604.StringIterator("L10e2t1C1o1d1e11");
+        test = new _604.Solution1.StringIterator("L10e2t1C1o1d1e11");
         System.out.println(test.hasNext());
         System.out.println(test.next());
         System.out.println(test.next());
@@ -58,7 +58,7 @@ public void test2() {
 
     @Test
     public void test3() {
-        test = new _604.StringIterator("x6");
+        test = new _604.Solution1.StringIterator("x6");
         System.out.println(test.hasNext());
         System.out.println(test.next());
         System.out.println(test.next());
@@ -73,7 +73,7 @@ public void test3() {
 
     @Test
     public void test4() {
-        test = new _604.StringIterator("X15D18V8");
+        test = new _604.Solution1.StringIterator("X15D18V8");
         System.out.println(test.hasNext());
         System.out.println(test.next());
         System.out.println(test.next());
