Fix syntax errors in decompiled sources

Author: emmanue1

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

@@ -297,8 +297,9 @@ public void visit(LongConstantExpression expression) {
 
     @Override
     public void visit(MethodInvocationExpression expression) {
-        safeAccept(expression.getParameters());
         expression.getExpression().accept(this);
+        safeAccept(expression.getNonWildcardTypeArguments());
+        safeAccept(expression.getParameters());
     }
 
     @Override
@@ -319,7 +320,6 @@ public void visit(NewExpression expression) {
         BaseType type = expression.getType();
 
         type.accept(this);
-        safeAccept(expression.getNonWildcardTypeArguments());
         safeAccept(expression.getParameters());
         // safeAccept(expression.getBodyDeclaration());
     }
@@ -332,17 +332,6 @@ public void visit(NewInitializedArray expression) {
         safeAccept(expression.getArrayInitializer());
     }
 
-    @Override
-    public void visit(NewInnerExpression expression) {
-        BaseType type = expression.getType();
-
-        type.accept(this);
-        expression.getExpression().accept(this);
-        safeAccept(expression.getNonWildcardTypeArguments());
-        safeAccept(expression.getParameters());
-        //safeAccept(expression.getBodyDeclaration());
-    }
-
     @Override
     public void visit(NullExpression expression) {
         BaseType type = expression.getType();
@@ -627,16 +616,16 @@ public void visit(WhileStatement statement) {
     }
 
     @Override
-    public void visit(TypeParameter type) {}
+    public void visit(TypeParameter parameter) {}
 
     @Override
-    public void visit(TypeParameterWithTypeBounds type) {
-        type.getTypeBounds().accept(this);
+    public void visit(TypeParameterWithTypeBounds parameter) {
+        parameter.getTypeBounds().accept(this);
     }
 
     @Override
-    public void visit(TypeParameters types) {
-        Iterator<TypeParameter> iterator = types.iterator();
+    public void visit(TypeParameters parameters) {
+        Iterator<TypeParameter> iterator = parameters.iterator();
 
         while (iterator.hasNext())
             iterator.next().accept(this);

src/main/java/org/jd/core/v1/model/javasyntax/expression/AbstractNopExpressionVisitor.java

@@ -32,7 +32,6 @@ public abstract class AbstractNopExpressionVisitor implements ExpressionVisitor
     @Override public void visit(NewArray expression) {}
     @Override public void visit(NewExpression expression) {}
     @Override public void visit(NewInitializedArray expression) {}
-    @Override public void visit(NewInnerExpression expression) {}
     @Override public void visit(NullExpression expression) {}
     @Override public void visit(ObjectTypeReferenceExpression expression) {}
     @Override public void visit(ParenthesesExpression expression) {}

src/main/java/org/jd/core/v1/model/javasyntax/expression/ExpressionVisitor.java

@@ -32,7 +32,6 @@ public interface ExpressionVisitor {
     void visit(NewArray expression);
     void visit(NewExpression expression);
     void visit(NewInitializedArray expression);
-    void visit(NewInnerExpression expression);
     void visit(NullExpression expression);
     void visit(ObjectTypeReferenceExpression expression);
     void visit(ParenthesesExpression expression);

src/main/java/org/jd/core/v1/model/javasyntax/expression/MethodInvocationExpression.java

@@ -7,9 +7,11 @@
 
 package org.jd.core.v1.model.javasyntax.expression;
 
+import org.jd.core.v1.model.javasyntax.type.BaseTypeArgument;
 import org.jd.core.v1.model.javasyntax.type.Type;
 
 public class MethodInvocationExpression extends MethodReferenceExpression {
+    protected BaseTypeArgument nonWildcardTypeArguments;
     protected BaseExpression parameters;
 
     public MethodInvocationExpression(Type type, Expression expression, String internalTypeName, String name, String descriptor) {
@@ -30,6 +32,14 @@ public MethodInvocationExpression(int lineNumber, Type type, Expression expressi
         this.parameters = parameters;
     }
 
+    public BaseTypeArgument getNonWildcardTypeArguments() {
+        return nonWildcardTypeArguments;
+    }
+
+    public void setNonWildcardTypeArguments(BaseTypeArgument nonWildcardTypeArguments) {
+        this.nonWildcardTypeArguments = nonWildcardTypeArguments;
+    }
+
     public BaseExpression getParameters() {
         return parameters;
     }

src/main/java/org/jd/core/v1/model/javasyntax/expression/NewExpression.java

@@ -8,41 +8,28 @@
 package org.jd.core.v1.model.javasyntax.expression;
 
 import org.jd.core.v1.model.javasyntax.declaration.BodyDeclaration;
-import org.jd.core.v1.model.javasyntax.type.BaseTypeArgument;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.model.javasyntax.type.Type;
 
 public class NewExpression extends AbstractLineNumberExpression {
-    protected BaseTypeArgument nonWildcardTypeArguments;
     protected ObjectType type;
     protected String descriptor;
     protected BaseExpression parameters;
     protected BodyDeclaration bodyDeclaration;
 
-    public NewExpression(int lineNumber, ObjectType type) {
+    public NewExpression(int lineNumber, ObjectType type, String descriptor) {
         super(lineNumber);
         this.type = type;
+        this.descriptor = descriptor;
     }
 
-    public NewExpression(int lineNumber, ObjectType type, BodyDeclaration bodyDeclaration) {
-        super(lineNumber);
-        this.type = type;
-        this.bodyDeclaration = bodyDeclaration;
-    }
-
-    public NewExpression(int lineNumber, BaseTypeArgument nonWildcardTypeArguments, ObjectType type, String descriptor, BaseExpression parameters, BodyDeclaration bodyDeclaration) {
+    public NewExpression(int lineNumber, ObjectType type, String descriptor, BodyDeclaration bodyDeclaration) {
         super(lineNumber);
-        this.nonWildcardTypeArguments = nonWildcardTypeArguments;
         this.type = type;
         this.descriptor = descriptor;
-        this.parameters = parameters;
         this.bodyDeclaration = bodyDeclaration;
     }
 
-    public BaseTypeArgument getNonWildcardTypeArguments() {
-        return nonWildcardTypeArguments;
-    }
-
     public ObjectType getObjectType() {
         return type;
     }

src/main/java/org/jd/core/v1/model/javasyntax/expression/NewInnerExpression.java

@@ -8,7 +8,7 @@
 package org.jd.core.v1.model.javasyntax.type;
 
 public interface TypeParameterVisitor {
-    void visit(TypeParameter type);
-    void visit(TypeParameterWithTypeBounds type);
-    void visit(TypeParameters types);
+    void visit(TypeParameter parameter);
+    void visit(TypeParameterWithTypeBounds parameter);
+    void visit(TypeParameters parameters);
 }

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

@@ -16,9 +16,9 @@
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeParametersToTypeArgumentsBinder;
 
 public class ClassFileMethodInvocationExpression extends MethodInvocationExpression {
+    protected TypeParametersToTypeArgumentsBinder binder;
     protected BaseTypeParameter typeParameters;
     protected BaseType parameterTypes;
-    protected TypeParametersToTypeArgumentsBinder binder;
 
     public ClassFileMethodInvocationExpression(
             TypeParametersToTypeArgumentsBinder binder,

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/expression/ClassFileMethodInvocationExpression.java

@@ -17,11 +17,11 @@ public class ClassFileNewExpression extends NewExpression {
     protected BaseType parameterTypes;
 
     public ClassFileNewExpression(int lineNumber, ObjectType type) {
-        super(lineNumber, type);
+        super(lineNumber, type, null);
     }
 
     public ClassFileNewExpression(int lineNumber, ObjectType type, BodyDeclaration bodyDeclaration) {
-        super(lineNumber, type, bodyDeclaration);
+        super(lineNumber, type, null, bodyDeclaration);
     }
 
     public BaseType getParameterTypes() {

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/expression/ClassFileNewExpression.java

@@ -43,13 +43,13 @@
 public class ConvertClassFileProcessor implements Processor {
     protected PopulateBindingsWithTypeParameterVisitor populateBindingsWithTypeParameterVisitor = new PopulateBindingsWithTypeParameterVisitor() {
         @Override
-        public void visit(TypeParameter type) {
-            bindings.put(type.getIdentifier(), new GenericType(type.getIdentifier()));
+        public void visit(TypeParameter parameter) {
+            bindings.put(parameter.getIdentifier(), new GenericType(parameter.getIdentifier()));
         }
         @Override
-        public void visit(TypeParameterWithTypeBounds type) {
-            bindings.put(type.getIdentifier(), new GenericType(type.getIdentifier()));
-            typeBounds.put(type.getIdentifier(), type.getTypeBounds());
+        public void visit(TypeParameterWithTypeBounds parameter) {
+            bindings.put(parameter.getIdentifier(), new GenericType(parameter.getIdentifier()));
+            typeBounds.put(parameter.getIdentifier(), parameter.getTypeBounds());
         }
     };