Fix syntax errors in decompiled sources

Author: emmanue1

src/main/java/org/jd/core/v1/model/javasyntax/AbstractJavaSyntaxVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -87,7 +87,7 @@ public void visit(Expressions list) {
 
     @Override
     public void visit(ExpressionVariableInitializer declaration) {
-        safeAccept(declaration.getExpression());
+        declaration.getExpression().accept(this);
     }
 
     @Override
@@ -98,8 +98,8 @@ public void visit(FieldDeclaration declaration) {
     }
 
     @Override
-    public void visit(FieldDeclarator declaration) {
-        safeAccept(declaration.getVariableInitializer());
+    public void visit(FieldDeclarator declarator) {
+        safeAccept(declarator.getVariableInitializer());
     }
 
     @Override

src/main/java/org/jd/core/v1/model/javasyntax/declaration/AnnotationDeclaration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -34,6 +34,6 @@ public void accept(DeclarationVisitor visitor) {
 
     @Override
     public String toString() {
-        return "AnnotationDeclaration{" + internalName + "}";
+        return "AnnotationDeclaration{" + internalTypeName + "}";
     }
 }

src/main/java/org/jd/core/v1/model/javasyntax/declaration/ClassDeclaration.java

@@ -35,6 +35,6 @@ public void accept(DeclarationVisitor visitor) {
 
     @Override
     public String toString() {
-        return "ClassDeclaration{" + internalName + "}";
+        return "ClassDeclaration{" + internalTypeName + "}";
     }
 }

src/main/java/org/jd/core/v1/model/javasyntax/declaration/EnumDeclaration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -50,7 +50,7 @@ public void accept(DeclarationVisitor visitor) {
 
     @Override
     public String toString() {
-        return "EnumDeclaration{" + internalName + "}";
+        return "EnumDeclaration{" + internalTypeName + "}";
     }
 
     public static class Constant implements Declaration {

src/main/java/org/jd/core/v1/model/javasyntax/declaration/InterfaceDeclaration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -47,6 +47,6 @@ public void accept(DeclarationVisitor visitor) {
 
     @Override
     public String toString() {
-        return "InterfaceDeclaration{" + internalName + "}";
+        return "InterfaceDeclaration{" + internalTypeName + "}";
     }
 }

src/main/java/org/jd/core/v1/model/javasyntax/declaration/ModuleDeclaration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -41,7 +41,7 @@ public void accept(DeclarationVisitor visitor) {
 
     @Override
     public String toString() {
-        return "ModuleDeclaration{" + internalName + "}";
+        return "ModuleDeclaration{" + internalTypeName + "}";
     }
 
     public static class ModuleInfo {

src/main/java/org/jd/core/v1/model/javasyntax/declaration/TypeDeclaration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
@@ -12,13 +12,13 @@
 public abstract class TypeDeclaration implements BaseTypeDeclaration, MemberDeclaration {
     protected BaseAnnotationReference annotationReferences;
     protected int flags;
-    protected String internalName;
+    protected String internalTypeName;
     protected String name;
 
-    protected TypeDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalName, String name) {
+    protected TypeDeclaration(BaseAnnotationReference annotationReferences, int flags, String internalTypeName, String name) {
         this.annotationReferences = annotationReferences;
         this.flags = flags;
-        this.internalName = internalName;
+        this.internalTypeName = internalTypeName;
         this.name = name;
     }
 
@@ -30,8 +30,8 @@ public int getFlags() {
         return flags;
     }
 
-    public String getInternalName() {
-        return internalName;
+    public String getInternalTypeName() {
+        return internalTypeName;
     }
 
     public String getName() {

src/main/java/org/jd/core/v1/model/javasyntax/type/ArrayTypeArguments.java

@@ -20,8 +20,8 @@ public ArrayTypeArguments(List<TypeArgument> list) {
     }
 
     @Override
-    public void accept(TypeVisitor visitor) {
-        visitor.visit(this);
+    public boolean isList() {
+        return true;
     }
 
     @Override
@@ -47,4 +47,14 @@ public boolean isTypeArgumentAssignableFrom(BaseTypeArgument typeArgument) {
 
         return true;
     }
+
+    @Override
+    public int typeArgumentSize() {
+        return size();
+    }
+
+    @Override
+    public void accept(TypeVisitor visitor) {
+        visitor.visit(this);
+    }
 }

src/main/java/org/jd/core/v1/model/javasyntax/type/BaseTypeArgument.java

@@ -7,6 +7,21 @@
 
 package org.jd.core.v1.model.javasyntax.type;
 
+import org.jd.core.v1.util.DefaultList;
+
+@SuppressWarnings("unchecked")
 public interface BaseTypeArgument extends TypeVisitable {
     boolean isTypeArgumentAssignableFrom(BaseTypeArgument typeArgument);
+
+    default TypeArgument getTypeArgumentFirst() {
+        return (TypeArgument)this;
+    }
+
+    default DefaultList<TypeArgument> getTypeArgumentList() {
+        return (DefaultList<TypeArgument>)this;
+    }
+
+    default int typeArgumentSize() {
+        return 1;
+    }
 }

src/main/java/org/jd/core/v1/model/javasyntax/type/GenericType.java

@@ -67,7 +67,15 @@ public void accept(TypeVisitor visitor) {
 
     @Override
     public boolean isTypeArgumentAssignableFrom(BaseTypeArgument typeArgument) {
-        return equals(typeArgument);
+        if (typeArgument.getClass() == GenericType.class) {
+            return true;
+        } else if (typeArgument instanceof Type) {
+            return true;
+        } else if (typeArgument instanceof WildcardTypeArgument) {
+            return false;
+        }
+
+        return false;
     }
 
     @Override