Changed license to LGPLv3.

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

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 (file)
new mode 100755 (executable)
index 43d7625..941851d
--- 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-2014, 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