X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FJavaFile.java;h=ea05f016a5f2f702c6d9552280a254021e2e65ee;hb=05934ede2e526bc55d3661d6029891bef70fd3b9;hp=400ff872fde03d1e03a4c5675e5e15e2b7ed029e;hpb=9811fe796d6f549151ab904714e1a65ff2839ee2;p=javainspect.git

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 400ff87..ea05f01 100644
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
@@ -33,6 +33,8 @@ public class JavaFile {
 		readFile();
 
 		final Tokenizer tokenizer = new Tokenizer(contents.toString());
+
+		// empty space
 		tokenizer.addTerminator(" ", true);
 		tokenizer.addTerminator("\t", true);
 		tokenizer.addTerminator("\n", true);
@@ -48,10 +50,14 @@ public class JavaFile {
 		tokenizer.addTerminator(">", false);
 		tokenizer.addTerminator(",", false);
 
+		// comments
+		tokenizer.addTerminator("//", "\n", true);
+		tokenizer.addTerminator("/*", "*/", true);
+
 		final Modifiers modifiers = new Modifiers();
 
 		while (true) {
-			final TokenizerMatch match = tokenizer.getToken();
+			final TokenizerMatch match = tokenizer.getNextToken();
 			if (match == null)
 				break;
 
@@ -74,6 +80,11 @@ public class JavaFile {
 				continue;
 			}
 
+			if ("interface".equals(match.token)) {
+				parseInterface(tokenizer);
+				continue;
+			}
+
 			System.out.println("    " + modifiers.toString() + " "
 					+ match.token);
 			modifiers.reset();
@@ -85,10 +96,10 @@ public class JavaFile {
 	private void parseClass(final Tokenizer tokenizer)
 			throws InvalidSyntaxException {
 
-		final TokenizerMatch match = tokenizer.getToken();
-		final Clazz clazz = new Clazz(packageName, match.token, tokenizer);
+		final TokenizerMatch match = tokenizer.getNextToken();
+		final Clazz clazz = new Clazz(packageName, match.token, tokenizer,
+				false);
 		System.out.println(clazz.toString());
-
 	}
 
 	private void parseImport(final Tokenizer tokenizer)
@@ -96,27 +107,35 @@ public class JavaFile {
 
 		final Import imp = new Import();
 
-		final TokenizerMatch match = tokenizer.getToken();
+		final TokenizerMatch match = tokenizer.getNextToken();
 
 		if (match.token.equals("static")) {
 			imp.isStatic = true;
-			imp.path = tokenizer.getToken().token;
+			imp.path = tokenizer.getNextToken().token;
 		} else
 			imp.path = match.token;
 
 		imports.add(imp);
 
-		tokenizer.expectToken(";");
+		tokenizer.expectNextToken(";");
+	}
+
+	private void parseInterface(final Tokenizer tokenizer)
+			throws InvalidSyntaxException {
+
+		final TokenizerMatch match = tokenizer.getNextToken();
+		final Clazz clazz = new Clazz(packageName, match.token, tokenizer, true);
+		System.out.println(clazz.toString());
 	}
 
 	private void parsePackage(final Tokenizer tokenizer)
 			throws InvalidSyntaxException {
 
-		final TokenizerMatch match = tokenizer.getToken();
+		final TokenizerMatch match = tokenizer.getNextToken();
 
 		packageName = match.token;
 
-		tokenizer.expectToken(";");
+		tokenizer.expectNextToken(";");
 	}
 
 	private void readFile() throws FileNotFoundException, IOException {
@@ -140,7 +159,11 @@ public class JavaFile {
 
 	public void skipUntilSemicolon(final Tokenizer tokenizer) {
 		while (true) {
-			final TokenizerMatch token = tokenizer.getToken();
+			final TokenizerMatch token = tokenizer.getNextToken();
+
+			if (token == null)
+				return;
+
 			if (token.token.equals(";"))
 				return;
 		}