X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=javainspect.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FClassReference.java;h=f4fac419f96b09809fb4e485e7802218a836dc97;hp=a40349499862ea0ea451df3ecf7750d2c3d24cd5;hb=b2f519fd934cd49afbb5cfc88b3d2be396af0afa;hpb=93d3fd571ed634437334b78bec8fd725f4c90701

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 a403494..f4fac41 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-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2013-2020, 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