#46 refactoring

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/removers/JcpCommentLineRemover.java

@@ -42,10 +42,8 @@ public JcpCommentLineRemover(final Reader src, final Writer dst,
   @Override
   public Writer process() throws IOException {
     final int STATE_NORMAL = 0;
-    final int STATE_INSIDE_STRING = 1;
-    final int STATE_NEXT_SPECIAL_CHAR = 2;
-    final int STATE_FORWARD_SLASH = 3;
-    final int STATE_POSSIBLE_JCP = 4;
+    final int STATE_FORWARD_SLASH = 1;
+    final int STATE_POSSIBLE_JCP = 2;
 
     final StringBuilder jcpBuffer = new StringBuilder();
 
@@ -59,20 +57,13 @@ public Writer process() throws IOException {
 
       switch (state) {
         case STATE_NORMAL: {
-          switch (chr) {
-            case '\"': {
-              this.dstWriter.write(chr);
-              state = STATE_INSIDE_STRING;
-            }
-            break;
-            case '/': {
-              state = STATE_FORWARD_SLASH;
-            }
-            break;
-            default: {
-              this.dstWriter.write(chr);
-            }
-            break;
+          if (chr == '/') {
+            state = STATE_FORWARD_SLASH;
+          } else if (Character.isWhitespace(chr)) {
+            this.dstWriter.write(chr);
+          } else {
+            this.dstWriter.write(chr);
+            this.copyTillNextString();
           }
         }
         break;
@@ -121,27 +112,6 @@ public Writer process() throws IOException {
           }
         }
         break;
-        case STATE_INSIDE_STRING: {
-          switch (chr) {
-            case '\\': {
-              state = STATE_NEXT_SPECIAL_CHAR;
-            }
-            break;
-            case '\"': {
-              state = STATE_NORMAL;
-            }
-            break;
-            default:
-              break;
-          }
-          this.dstWriter.write(chr);
-        }
-        break;
-        case STATE_NEXT_SPECIAL_CHAR: {
-          this.dstWriter.write(chr);
-          state = STATE_INSIDE_STRING;
-        }
-        break;
         default:
           throw new IllegalStateException("Unexpected state: " + state);
       }

jcp/src/test/java/com/igormaznitsa/jcp/removers/JcpCommentLineRemoverTest.java

@@ -78,6 +78,21 @@ public void testJcpDirectivesInComments() throws Exception {
     );
   }
 
+  @Test
+  public void testCommentedJcpDirective() throws Exception {
+    this.assertCommentRemove(
+        "/** some multiline //$  //# test\nwith jcp directives*/\n//$ some\n//$$$ some two\n// hello world\n////#if DEBUG\nSystem.out.println(\"DEBUG\");\n//#else\nSystem.out.println(\"RELEASE\");\n//#endif\n// end",
+        "/** some multiline //$  //# test\nwith jcp directives*/\n\n\n// hello world\n////#if DEBUG\nSystem.out.println(\"DEBUG\");\n\nSystem.out.println(\"RELEASE\");\n\n// end"
+    );
+
+    if (this.whiteSpaced) {
+      this.assertCommentRemove(
+          "/** some multiline //$  //# test\nwith jcp directives*/\n//  $ some\n//    $$$ some two\n// hello world\n////  #if DEBUG\nSystem.out.println(\"DEBUG\");\n//   # else\nSystem.out.println(\"RELEASE\");\n//   #endif\n// end",
+          "/** some multiline //$  //# test\nwith jcp directives*/\n\n\n// hello world\n////  #if DEBUG\nSystem.out.println(\"DEBUG\");\n\nSystem.out.println(\"RELEASE\");\n\n// end"
+      );
+    }
+  }
+
   @Test
   public void testLineCommentInTheEnd() throws Exception {
     this.assertCommentRemove(