Migrating to latest svjatoslav-commons.

[javainspect.git] / src / main / java / eu / svjatoslav / inspector / java / methods / JavaFile.java

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java b/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
index df53ee8..9ec86c3 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
@@ -17,6 +17,9 @@ import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
+import static eu.svjatoslav.commons.string.tokenizer.Terminator.TerminationStrategy.DROP;
+import static eu.svjatoslav.commons.string.tokenizer.Terminator.TerminationStrategy.PRESERVE;
+
 public class JavaFile {
 
     public static final String UTF_8 = "UTF-8";
@@ -39,25 +42,25 @@ public class JavaFile {
         final Tokenizer tokenizer = new Tokenizer(contents.toString());
 
         // empty space
-        tokenizer.addTerminator(" ", true);
-        tokenizer.addTerminator("\t", true);
-        tokenizer.addTerminator("\n", true);
-
-        tokenizer.addTerminator(";", false);
-        tokenizer.addTerminator("{", false);
-        tokenizer.addTerminator("}", false);
-        tokenizer.addTerminator("(", false);
-        tokenizer.addTerminator(")", false);
-        tokenizer.addTerminator("[", false);
-        tokenizer.addTerminator("]", false);
-        tokenizer.addTerminator("<", false);
-        tokenizer.addTerminator(">", false);
-        tokenizer.addTerminator(",", false);
-        tokenizer.addTerminator("@", false);
+        tokenizer.addTerminator(" ",  DROP);
+        tokenizer.addTerminator("\t", DROP);
+        tokenizer.addTerminator("\n", DROP);
+
+        tokenizer.addTerminator(";", PRESERVE);
+        tokenizer.addTerminator("{", PRESERVE);
+        tokenizer.addTerminator("}", PRESERVE);
+        tokenizer.addTerminator("(", PRESERVE);
+        tokenizer.addTerminator(")", PRESERVE);
+        tokenizer.addTerminator("[", PRESERVE);
+        tokenizer.addTerminator("]", PRESERVE);
+        tokenizer.addTerminator("<", PRESERVE);
+        tokenizer.addTerminator(">", PRESERVE);
+        tokenizer.addTerminator(",", PRESERVE);
+        tokenizer.addTerminator("@", PRESERVE);
 
         // comments
-        tokenizer.addTerminator("//", "\n", true);
-        tokenizer.addTerminator("/*", "*/", true);
+        tokenizer.addTerminator("//", "\n", DROP);
+        tokenizer.addTerminator("/*", "*/", DROP);
 
         final Modifiers modifiers = new Modifiers();
 
@@ -129,7 +132,7 @@ public class JavaFile {
 
         imports.add(imp);
 
-        tokenizer.expectNextToken(";");
+        tokenizer.expectAndConsumeNextToken(";");
     }
 
     private void parseInterface(final Tokenizer tokenizer)
@@ -148,7 +151,7 @@ public class JavaFile {
 
         packageName = match.token;
 
-        tokenizer.expectNextToken(";");
+        tokenizer.expectAndConsumeNextToken(";");
     }
 
     private void readFile() throws IOException {
@@ -170,7 +173,7 @@ public class JavaFile {
         inputStream.close();
     }
 
-    public void skipUntilSemicolon(final Tokenizer tokenizer) {
+    public void skipUntilSemicolon(final Tokenizer tokenizer) throws InvalidSyntaxException {
         while (true) {
             final TokenizerMatch token = tokenizer.getNextToken();