X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FClassReference.java;h=4643d860846cf2be4a5931b7bc0dcdce42c0bc14;hb=c508bf97e017675b49df989b7f5a64cbd31d9aa3;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
old mode 100644
new mode 100755
index 43d7625..4643d86
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
@@ -1,10 +1,19 @@
+/*
+ * JavaInspect - Utility to visualize java software
+ * Copyright (C) 2013-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+ */
+
 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 +23,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