Fix bug on parameters in method invocations

Author: emmanue1

src/main/java/org/jd/core/v1/model/javasyntax/expression/NewExpression.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.
@@ -73,11 +73,6 @@ public void setParameters(BaseExpression parameters) {
         this.parameters = parameters;
     }
 
-    public void setDescriptorAndParameters(String descriptor, BaseExpression parameters) {
-        this.descriptor = descriptor;
-        this.parameters = parameters;
-    }
-
     public BodyDeclaration getBodyDeclaration() {
         return bodyDeclaration;
     }

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

@@ -8,6 +8,9 @@
 package org.jd.core.v1.model.javasyntax.type;
 
 public class WildcardTypeArgument implements TypeArgument {
+    public static final WildcardTypeArgument WILDCARD_TYPE_ARGUMENT = new WildcardTypeArgument();
+
+    private WildcardTypeArgument() {}
 
     @Override
     public void accept(TypeVisitor visitor) {

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

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression;
+
+import org.jd.core.v1.model.javasyntax.expression.BaseExpression;
+import org.jd.core.v1.model.javasyntax.expression.ConstructorInvocationExpression;
+import org.jd.core.v1.model.javasyntax.type.ObjectType;
+import org.jd.core.v1.model.javasyntax.type.Type;
+import org.jd.core.v1.util.DefaultList;
+
+public class ClassFileConstructorInvocationExpression extends ConstructorInvocationExpression {
+    protected DefaultList<Type> parameterTypes;
+
+    public ClassFileConstructorInvocationExpression(int lineNumber, ObjectType type, String descriptor, DefaultList<Type> parameterTypes, BaseExpression parameters) {
+        super(lineNumber, type, descriptor, parameters);
+        this.parameterTypes = parameterTypes;
+    }
+
+    public DefaultList<Type> getParameterTypes() {
+        return parameterTypes;
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression;
+
+import org.jd.core.v1.model.javasyntax.expression.BaseExpression;
+import org.jd.core.v1.model.javasyntax.expression.Expression;
+import org.jd.core.v1.model.javasyntax.expression.MethodInvocationExpression;
+import org.jd.core.v1.model.javasyntax.type.Type;
+import org.jd.core.v1.util.DefaultList;
+
+public class ClassFileMethodInvocationExpression extends MethodInvocationExpression {
+    protected DefaultList<Type> parameterTypes;
+
+    public ClassFileMethodInvocationExpression(int lineNumber, Type type, Expression expression, String internalTypeName, String name, String descriptor, DefaultList<Type> parameterTypes, BaseExpression parameters) {
+        super(lineNumber, type, expression, internalTypeName, name, descriptor, parameters);
+        this.parameterTypes = parameterTypes;
+    }
+
+    public DefaultList<Type> getParameterTypes() {
+        return parameterTypes;
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression;
+
+import org.jd.core.v1.model.javasyntax.declaration.BodyDeclaration;
+import org.jd.core.v1.model.javasyntax.expression.BaseExpression;
+import org.jd.core.v1.model.javasyntax.expression.NewExpression;
+import org.jd.core.v1.model.javasyntax.type.ObjectType;
+import org.jd.core.v1.model.javasyntax.type.Type;
+import org.jd.core.v1.util.DefaultList;
+
+public class ClassFileNewExpression extends NewExpression {
+    protected DefaultList<Type> parameterTypes;
+
+    public ClassFileNewExpression(int lineNumber, ObjectType type) {
+        super(lineNumber, type);
+    }
+
+    public ClassFileNewExpression(int lineNumber, ObjectType type, BodyDeclaration bodyDeclaration) {
+        super(lineNumber, type, bodyDeclaration);
+    }
+
+    public DefaultList<Type> getParameterTypes() {
+        return parameterTypes;
+    }
+
+    public void set(String descriptor, DefaultList<Type> parameterTypes, BaseExpression parameters) {
+        this.descriptor = descriptor;
+        this.parameterTypes = parameterTypes;
+        this.parameters = parameters;
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression;
+
+import org.jd.core.v1.model.javasyntax.expression.BaseExpression;
+import org.jd.core.v1.model.javasyntax.expression.SuperConstructorInvocationExpression;
+import org.jd.core.v1.model.javasyntax.type.ObjectType;
+import org.jd.core.v1.model.javasyntax.type.Type;
+import org.jd.core.v1.util.DefaultList;
+
+public class ClassFileSuperConstructorInvocationExpression extends SuperConstructorInvocationExpression {
+    protected DefaultList<Type> parameterTypes;
+
+    public ClassFileSuperConstructorInvocationExpression(int lineNumber, ObjectType type, String descriptor, DefaultList<Type> parameterTypes, BaseExpression parameters) {
+        super(lineNumber, type, descriptor, parameters);
+        this.parameterTypes = parameterTypes;
+    }
+
+    public DefaultList<Type> getParameterTypes() {
+        return parameterTypes;
+    }
+}

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/UpdateJavaSyntaxTreeProcessor.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,7 +12,8 @@
 import org.jd.core.v1.model.processor.Processor;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.ObjectTypeMaker;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.SignatureParser;
-import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.UpdateJavaSyntaxTreeVisitor;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.UpdateJavaSyntaxTreeStep1Visitor;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.UpdateJavaSyntaxTreeStep2Visitor;
 
 /**
  * Create statements, init fields, merge declarations.<br><br>
@@ -28,7 +29,10 @@ public void process(Message message) throws Exception {
         SignatureParser parser = message.getHeader("signatureParser");
         CompilationUnit compilationUnit = message.getBody();
 
-        UpdateJavaSyntaxTreeVisitor updateJavaSyntaxTreeVisitor = new UpdateJavaSyntaxTreeVisitor(maker, parser);
-        updateJavaSyntaxTreeVisitor.visit(compilationUnit);
+        UpdateJavaSyntaxTreeStep1Visitor updateJavaSyntaxTreeStep1Visitor = new UpdateJavaSyntaxTreeStep1Visitor(maker, parser);
+        updateJavaSyntaxTreeStep1Visitor.visit(compilationUnit);
+
+        UpdateJavaSyntaxTreeStep2Visitor updateJavaSyntaxTreeStep2Visitor = new UpdateJavaSyntaxTreeStep2Visitor();
+        updateJavaSyntaxTreeStep2Visitor.visit(compilationUnit);
     }
 }