X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FClassReference.java;h=470a0d55285b22c4cbbd0698b8356bce46534830;hb=16ba5341215d24fdcfa07072d52cf87e5a4375ed;hp=43d76259aeeb96af17d4ddcd9e25829fbedd187c;hpb=9811fe796d6f549151ab904714e1a65ff2839ee2;p=javainspect.git diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java index 43d7625..470a0d5 100644 --- a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java +++ b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java @@ -3,8 +3,8 @@ package eu.svjatoslav.inspector.java.methods; import java.util.ArrayList; import java.util.List; -import eu.svjatoslav.inspector.tokenizer.InvalidSyntaxException; -import eu.svjatoslav.inspector.tokenizer.Tokenizer; +import eu.svjatoslav.commons.string.tokenizer.InvalidSyntaxException; +import eu.svjatoslav.commons.string.tokenizer.Tokenizer; public class ClassReference { @@ -14,20 +14,20 @@ public class ClassReference { public ClassReference(final Tokenizer tokenizer) throws InvalidSyntaxException { - name = tokenizer.getToken().token; + name = tokenizer.getNextToken().token; - if (!tokenizer.isNextToken("<")) + if (!tokenizer.probeNextToken("<")) return; while (true) { final ClassReference parameterType = new ClassReference(tokenizer); typeParameters.add(parameterType); - if (!tokenizer.isNextToken(",")) + if (!tokenizer.probeNextToken(",")) break; } - tokenizer.expectToken(">"); + tokenizer.expectNextToken(">"); } @Override