Add type arguments on variable declaration of type 'Class'

emmanue1 · emmanue1 · commit 5ae9e8ac4506 · 2019-07-24T08:20:19.000+02:00
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/TypeReferenceDotClassExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/TypeReferenceDotClassExpression.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.
@@ -13,14 +13,17 @@
 public class TypeReferenceDotClassExpression implements Expression {
     protected int lineNumber;
     protected Type typeDotClass;
+    protected Type type;
 
     public TypeReferenceDotClassExpression(Type typeDotClass) {
         this.typeDotClass = typeDotClass;
+        this.type = ObjectType.TYPE_CLASS.createType(typeDotClass);
     }
 
     public TypeReferenceDotClassExpression(int lineNumber, Type typeDotClass) {
         this.lineNumber = lineNumber;
         this.typeDotClass = typeDotClass;
+        this.type = ObjectType.TYPE_CLASS.createType(typeDotClass);
     }
 
     @Override
@@ -34,7 +37,7 @@ public Type getTypeDotClass() {
 
     @Override
     public Type getType() {
-        return ObjectType.TYPE_CLASS;
+        return type;
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/ObjectLocalVariable.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/ObjectLocalVariable.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.
@@ -156,7 +156,7 @@ public void leftReduce(Type otherType) {
             } else if ((dimension == 0) && (otherType.getDimension() == 0) && otherType.isObject()) {
                 ObjectType otherObjectType = (ObjectType) otherType;
 
-                if (!toType.getInternalName().equals(otherObjectType.getInternalName()) && objectTypeMaker.isAssignable(otherObjectType, toType)) {
+                if (toType.getInternalName().equals(otherObjectType.getInternalName()) || objectTypeMaker.isAssignable(otherObjectType, toType)) {
                     if (toType.getTypeArguments() == null) {
                         toType = otherObjectType;
                     } else if (otherObjectType.getTypeArguments() == null) {
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/JavaSyntaxToJavaFragmentProcessor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/JavaSyntaxToJavaFragmentProcessor.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.
@@ -26,14 +26,15 @@ public class JavaSyntaxToJavaFragmentProcessor implements Processor {
     public void process(Message message) throws Exception {
         Loader loader = message.getHeader("loader");
         String mainInternalTypeName = message.getHeader("mainInternalTypeName");
+        int majorVersion = message.getHeader("majorVersion");
         CompilationUnit compilationUnit = message.getBody();
 
         SearchImportsVisitor importsVisitor = new SearchImportsVisitor(mainInternalTypeName);
         importsVisitor.visit(compilationUnit);
         ImportsFragment importsFragment = importsVisitor.getImportsFragment();
         message.setHeader("maxLineNumber", importsVisitor.getMaxLineNumber());
 
-        CompilationUnitVisitor visitor = new CompilationUnitVisitor(loader, mainInternalTypeName, importsFragment);
+        CompilationUnitVisitor visitor = new CompilationUnitVisitor(loader, mainInternalTypeName, majorVersion, importsFragment);
         visitor.visit(compilationUnit);
         message.setBody(visitor.getFragments());
     }
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/CompilationUnitVisitor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/CompilationUnitVisitor.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.
@@ -49,8 +49,8 @@ public class CompilationUnitVisitor extends StatementVisitor {
     protected SingleLineStatementVisitor singleLineStatementVisitor = new SingleLineStatementVisitor();
     protected String mainInternalName;
 
-    public CompilationUnitVisitor(Loader loader, String mainInternalTypeName, ImportsFragment importsFragment) {
-        super(loader, mainInternalTypeName, importsFragment);
+    public CompilationUnitVisitor(Loader loader, String mainInternalTypeName, int majorVersion, ImportsFragment importsFragment) {
+        super(loader, mainInternalTypeName, majorVersion, importsFragment);
         this.mainInternalName = mainInternalTypeName;
     }
 
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/ExpressionVisitor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/ExpressionVisitor.java
@@ -54,8 +54,8 @@ public class ExpressionVisitor extends TypeVisitor {
     protected String currentTypeName;
     protected HexaExpressionVisitor hexaExpressionVisitor = new HexaExpressionVisitor();
 
-    public ExpressionVisitor(Loader loader, String mainInternalTypeName, ImportsFragment importsFragment) {
-        super(loader, mainInternalTypeName, importsFragment);
+    public ExpressionVisitor(Loader loader, String mainInternalTypeName, int majorVersion, ImportsFragment importsFragment) {
+        super(loader, mainInternalTypeName, majorVersion, importsFragment);
     }
 
     public DefaultList<Fragment> getFragments() {
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/StatementVisitor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/StatementVisitor.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.
@@ -43,8 +43,8 @@ public class StatementVisitor extends ExpressionVisitor {
     public static final KeywordToken TRY = new KeywordToken("try");
     public static final KeywordToken WHILE = new KeywordToken("while");
 
-    public StatementVisitor(Loader loader, String mainInternalTypeName, ImportsFragment importsFragment) {
-        super(loader, mainInternalTypeName, importsFragment);
+    public StatementVisitor(Loader loader, String mainInternalTypeName, int majorVersion, ImportsFragment importsFragment) {
+        super(loader, mainInternalTypeName, majorVersion, importsFragment);
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/TypeVisitor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/TypeVisitor.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.
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 import java.util.List;
 
+import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_CLASS;
 import static org.jd.core.v1.model.javasyntax.type.PrimitiveType.*;
 
 public class TypeVisitor extends AbstractJavaSyntaxVisitor {
@@ -50,14 +51,16 @@ public class TypeVisitor extends AbstractJavaSyntaxVisitor {
 
     protected Loader loader;
     protected String internalPackageName;
+    protected int majorVersion;
     protected ImportsFragment importsFragment;
     protected Tokens tokens;
     protected int maxLineNumber = 0;
     protected String currentInternalTypeName;
     protected HashMap<String, TextToken> textTokenCache = new HashMap<>();
 
-    public TypeVisitor(Loader loader, String mainInternalTypeName, ImportsFragment importsFragment) {
+    public TypeVisitor(Loader loader, String mainInternalTypeName, int majorVersion, ImportsFragment importsFragment) {
         this.loader = loader;
+        this.majorVersion = majorVersion;
         this.importsFragment = importsFragment;
 
         int index = mainInternalTypeName.lastIndexOf('/');
@@ -104,7 +107,17 @@ public void visit(ObjectType type) {
         tokens.add(newTypeReferenceToken(type, currentInternalTypeName));
 
         // Build token for type arguments
-        visitTypeArgumentList(type.getTypeArguments());
+        BaseTypeArgument typeArguments = type.getTypeArguments();
+
+        if (majorVersion >= 49) { // (majorVersion >= Java 5)
+            if (typeArguments != null) {
+                visitTypeArgumentList(typeArguments);
+            } else if (type.equals(TYPE_CLASS)) {
+                tokens.add(TextToken.LEFTANGLEBRACKET);
+                tokens.add(TextToken.QUESTIONMARK);
+                tokens.add(TextToken.RIGHTANGLEBRACKET);
+            }
+        }
 
         // Build token for dimension
         visitDimension(type.getDimension());

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ public class ExpressionVisitor extends TypeVisitor {`
`54`	`54`	`protected String currentTypeName;`
`55`	`55`	`protected HexaExpressionVisitor hexaExpressionVisitor = new HexaExpressionVisitor();`
`56`	`56`
`57`		`- public ExpressionVisitor(Loader loader, String mainInternalTypeName, ImportsFragment importsFragment) {`
`58`		`- super(loader, mainInternalTypeName, importsFragment);`
	`57`	`+ public ExpressionVisitor(Loader loader, String mainInternalTypeName, int majorVersion, ImportsFragment importsFragment) {`
	`58`	`+ super(loader, mainInternalTypeName, majorVersion, importsFragment);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public DefaultList<Fragment> getFragments() {`