X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FClassReference.java;h=20189f83d638d2801124744ccc04810b8e0b3338;hb=fb953cf51bdc2bb20ba37c29ea22e26f283aa48e;hp=12216ab035533586b01a3a899c6eba7f1454a9b3;hpb=c680c10ad9057106e23b149246abdd84b41775ee;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 12216ab..20189f8 100755
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
@@ -1,7 +1,7 @@
 /*
  * JavaInspect - Utility to visualize java software
- * Copyright (C) 2013-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2013-2019, 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.
@@ -17,26 +17,25 @@ import java.util.List;
 
 public class ClassReference {
 
+    final List<ClassReference> typeParameters = new ArrayList<>();
     public String name;
 
-    List<ClassReference> typeParameters = new ArrayList<ClassReference>();
-
     public ClassReference(final Tokenizer tokenizer)
             throws InvalidSyntaxException {
         name = tokenizer.getNextToken().token;
 
-        if (!tokenizer.probeNextToken("<"))
+        if (!tokenizer.consumeIfNextToken("<"))
             return;
 
         while (true) {
             final ClassReference parameterType = new ClassReference(tokenizer);
             typeParameters.add(parameterType);
 
-            if (!tokenizer.probeNextToken(","))
+            if (!tokenizer.consumeIfNextToken(","))
                 break;
         }
 
-        tokenizer.expectNextToken(">");
+        tokenizer.expectAndConsumeNextToken(">");
     }
 
     @Override