Use common library to read file content.

[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
index 12216ab..f4fac41 100755 (executable)
--- 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-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