Fix local variable reference errors

Author: emmanue1

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

@@ -17,16 +17,6 @@ public LocalVariableDeclarator(String name) {
         this.name = name;
     }
 
-    public LocalVariableDeclarator(int lineNumber, String name) {
-        this.lineNumber = lineNumber;
-        this.name = name;
-    }
-
-    public LocalVariableDeclarator(String name, int dimension) {
-        this.name = name;
-        this.dimension = dimension;
-    }
-
     public LocalVariableDeclarator(String name, VariableInitializer variableInitializer) {
         this.name = name;
         this.variableInitializer = variableInitializer;
@@ -38,19 +28,6 @@ public LocalVariableDeclarator(int lineNumber, String name, VariableInitializer
         this.variableInitializer = variableInitializer;
     }
 
-    public LocalVariableDeclarator(String name, int dimension, VariableInitializer variableInitializer) {
-        this.name = name;
-        this.dimension = dimension;
-        this.variableInitializer = variableInitializer;
-    }
-
-    public LocalVariableDeclarator(int lineNumber, String name, int dimension, VariableInitializer variableInitializer) {
-        this.lineNumber = lineNumber;
-        this.name = name;
-        this.dimension = dimension;
-        this.variableInitializer = variableInitializer;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/javasyntax/declaration/ClassFileLocalVariableDeclarator.java

@@ -0,0 +1,50 @@
+/*
+ * 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.declaration;
+
+import org.jd.core.v1.model.javasyntax.declaration.LocalVariableDeclarator;
+import org.jd.core.v1.model.javasyntax.declaration.VariableInitializer;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.localvariable.AbstractLocalVariable;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.localvariable.LocalVariableReference;
+
+public class ClassFileLocalVariableDeclarator extends LocalVariableDeclarator implements LocalVariableReference {
+    protected AbstractLocalVariable localVariable;
+
+    public ClassFileLocalVariableDeclarator(AbstractLocalVariable localVariable) {
+        super(null);
+        this.localVariable = localVariable;
+    }
+
+    public ClassFileLocalVariableDeclarator(int lineNumber, AbstractLocalVariable localVariable, VariableInitializer variableInitializer) {
+        super(lineNumber, null, variableInitializer);
+        this.localVariable = localVariable;
+    }
+
+    public String getName() {
+        return localVariable.getName();
+    }
+
+    public void setName(String name) {
+        localVariable.setName(name);
+    }
+
+    @Override
+    public AbstractLocalVariable getLocalVariable() {
+        return localVariable;
+    }
+
+    @Override
+    public void setLocalVariable(AbstractLocalVariable localVariable) {
+        this.localVariable = localVariable;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassFileLocalVariableDeclarator{name=" + localVariable.getName() + ", dimension" + dimension + ", variableInitializer=" + variableInitializer + "}";
+    }
+}

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/Frame.java

@@ -11,6 +11,7 @@
 import org.jd.core.v1.model.javasyntax.expression.*;
 import org.jd.core.v1.model.javasyntax.statement.*;
 import org.jd.core.v1.model.javasyntax.type.*;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileLocalVariableDeclarator;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileLocalVariableReferenceExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.statement.ClassFileForStatement;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.LocalVariableMaker;
@@ -444,7 +445,7 @@ protected void createInlineDeclarations() {
 
                             for (AbstractLocalVariable lv : sorted) {
                                 // Add declaration before current statement
-                                iterator.add(new LocalVariableDeclarationStatement(lv.getType(), new LocalVariableDeclarator(lv.getName())));
+                                iterator.add(new LocalVariableDeclarationStatement(lv.getType(), new ClassFileLocalVariableDeclarator(lv)));
                                 lv.setDeclared(true);
                                 undeclaredLocalVariables.remove(lv);
                             }
@@ -560,7 +561,7 @@ protected LocalVariableDeclarationStatement newDeclarationStatement(
             variableInitializer = new ExpressionVariableInitializer(boe.getRightExpression());
         }
 
-        return new LocalVariableDeclarationStatement(type, new LocalVariableDeclarator(boe.getLineNumber(), reference.getName(), variableInitializer));
+        return new LocalVariableDeclarationStatement(type, new ClassFileLocalVariableDeclarator(boe.getLineNumber(), reference.getLocalVariable(), variableInitializer));
     }
 
     @SuppressWarnings("unchecked")
@@ -622,7 +623,7 @@ protected void updateForStatement(
                 ((NewInitializedArray)init.getRightExpression()).getArrayInitializer() :
                 new ExpressionVariableInitializer(init.getRightExpression());
 
-        forStatement.setDeclaration(new LocalVariableDeclaration(localVariable.getType(), new LocalVariableDeclarator(init.getLineNumber(), reference.getName(), variableInitializer)));
+        forStatement.setDeclaration(new LocalVariableDeclaration(localVariable.getType(), new ClassFileLocalVariableDeclarator(init.getLineNumber(), reference.getLocalVariable(), variableInitializer)));
         forStatement.setInit(null);
     }
 
@@ -709,7 +710,7 @@ protected LocalVariableDeclarators createDeclarators1(DefaultList<Expression> bo
             VariableInitializer variableInitializer = boe.getRightExpression().isNewInitializedArray() ?
                     ((NewInitializedArray) boe.getRightExpression()).getArrayInitializer() :
                     new ExpressionVariableInitializer(boe.getRightExpression());
-            LocalVariableDeclarator declarator = new LocalVariableDeclarator(boe.getLineNumber(), reference.getName(), variableInitializer);
+            LocalVariableDeclarator declarator = new ClassFileLocalVariableDeclarator(boe.getLineNumber(), reference.getLocalVariable(), variableInitializer);
 
             if (setDimension) {
                 declarator.setDimension(reference.getLocalVariable().getDimension());
@@ -734,7 +735,7 @@ protected void createStartBlockDeclarations() {
                     if (addIndex == -1) {
                         addIndex = getAddIndex();
                     }
-                    statements.add(addIndex, new LocalVariableDeclarationStatement(lv.getType(), new LocalVariableDeclarator(lv.getName())));
+                    statements.add(addIndex, new LocalVariableDeclarationStatement(lv.getType(), new ClassFileLocalVariableDeclarator(lv)));
                     lv.setDeclared(true);
                 }
 

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/InitInnerClassVisitor.java

@@ -13,7 +13,6 @@
 import org.jd.core.v1.model.javasyntax.expression.*;
 import org.jd.core.v1.model.javasyntax.statement.*;
 import org.jd.core.v1.model.javasyntax.type.BaseType;
-import org.jd.core.v1.model.javasyntax.type.InnerObjectType;
 import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.model.javasyntax.type.Type;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.*;
@@ -113,7 +112,7 @@ public void visit(ConstructorDeclaration declaration) {
                         Expression e = expression.getLeftExpression();
 
                         if (e.isFieldReferenceExpression()) {
-                            String name = ((FieldReferenceExpression)e).getName();
+                            String name = e.getName();
 
                             if (name.startsWith("this$")) {
                                 outerType = (ObjectType) expression.getRightExpression().getType();