Fix bug in enum constant declarations

Author: emmanue1

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

@@ -7,6 +7,7 @@
 
 package org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration;
 
+import org.jd.core.v1.model.javasyntax.declaration.BodyDeclaration;
 import org.jd.core.v1.model.javasyntax.declaration.EnumDeclaration;
 import org.jd.core.v1.model.javasyntax.expression.BaseExpression;
 import org.jd.core.v1.model.javasyntax.reference.BaseAnnotationReference;
@@ -43,8 +44,8 @@ public String toString() {
     public static class ClassFileConstant extends Constant {
         protected int index;
 
-        public ClassFileConstant(int lineNumber, String name, int index, BaseExpression arguments) {
-            super(lineNumber, name, arguments);
+        public ClassFileConstant(int lineNumber, String name, int index, BaseExpression arguments, BodyDeclaration bodyDeclaration) {
+            super(lineNumber, name, arguments, bodyDeclaration);
             this.index = index;
         }
 

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

@@ -20,6 +20,8 @@
 
 
 public class InitEnumVisitor extends AbstractJavaSyntaxVisitor {
+    protected ClassFileBodyDeclaration bodyDeclaration = null;
+    protected BodyDeclaration constantBodyDeclaration = null;
     protected DefaultList<ClassFileEnumDeclaration.ClassFileConstant> constants = new DefaultList<>();
     protected int lineNumber;
     protected int index;
@@ -36,10 +38,13 @@ public DefaultList<EnumDeclaration.Constant> getConstants() {
 
     @Override
     public void visit(BodyDeclaration declaration) {
-        ClassFileBodyDeclaration bodyDeclaration = (ClassFileBodyDeclaration)declaration;
+        ClassFileBodyDeclaration bd = bodyDeclaration;
+
+        bodyDeclaration = (ClassFileBodyDeclaration)declaration;
         constants.clear();
         safeAcceptListDeclaration(bodyDeclaration.getFieldDeclarations());
         safeAcceptListDeclaration(bodyDeclaration.getMethodDeclarations());
+        bodyDeclaration = bd;
     }
 
     @Override
@@ -89,8 +94,9 @@ public void visit(FieldDeclaration declaration) {
 
     @Override
     public void visit(FieldDeclarator declaration) {
+        constantBodyDeclaration = null;
         safeAccept(declaration.getVariableInitializer());
-        constants.add(new ClassFileEnumDeclaration.ClassFileConstant(lineNumber, declaration.getName(), index, arguments));
+        constants.add(new ClassFileEnumDeclaration.ClassFileConstant(lineNumber, declaration.getName(), index, arguments, constantBodyDeclaration));
     }
 
     @Override
@@ -115,6 +121,15 @@ public void visit(NewExpression expression) {
             parameters.subList(0, 2).clear();
             arguments = parameters;
         }
+
+        String enumInternalTypeName = expression.getObjectType().getInternalName();
+
+        if (!enumInternalTypeName.equals(bodyDeclaration.getInternalTypeName())) {
+            ClassFileMemberDeclaration md = bodyDeclaration.getInnerTypeDeclaration(enumInternalTypeName);
+            if (md != null) {
+                constantBodyDeclaration = ((ClassFileEnumDeclaration)md).getBodyDeclaration();
+            }
+        }
     }
 
     protected static class EnumConstantComparator implements Comparator<ClassFileEnumDeclaration.ClassFileConstant> {

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

@@ -12,6 +12,7 @@
 import org.jd.core.v1.model.javasyntax.expression.BinaryOperatorExpression;
 import org.jd.core.v1.model.javasyntax.expression.Expression;
 import org.jd.core.v1.model.javasyntax.expression.FieldReferenceExpression;
+import org.jd.core.v1.model.javasyntax.statement.BaseStatement;
 import org.jd.core.v1.model.javasyntax.statement.ExpressionStatement;
 import org.jd.core.v1.model.javasyntax.statement.Statement;
 import org.jd.core.v1.model.javasyntax.type.PrimitiveType;
@@ -84,27 +85,25 @@ public void visit(MethodDeclaration declaration) {}
     public void visit(StaticInitializerDeclaration declaration) {
         staticDeclaration = (ClassFileStaticInitializerDeclaration) declaration;
 
-        if (!staticDeclaration.getStatements().isList()) {
-            return;
-        }
-
-        DefaultList<Statement> statements = staticDeclaration.getStatements().getList();
+        BaseStatement statements = staticDeclaration.getStatements();
 
-        if ((statements != null) && !statements.isEmpty()) {
-            Statement statement = statements.getFirst();
+        if ((statements != null) && (statements.size() > 0)) {
+            if (statements.isList()) {
+                Statement statement = statements.getFirst();
 
-            if (statement.getClass() == ExpressionStatement.class) {
-                ExpressionStatement cdes = (ExpressionStatement) statement;
+                if ((statement.getClass() == ExpressionStatement.class)) {
+                    ExpressionStatement cdes = (ExpressionStatement) statement;
 
-                if (cdes.getExpression().getClass() == BinaryOperatorExpression.class) {
-                    BinaryOperatorExpression cfboe = (BinaryOperatorExpression) cdes.getExpression();
+                    if (cdes.getExpression().getClass() == BinaryOperatorExpression.class) {
+                        BinaryOperatorExpression cfboe = (BinaryOperatorExpression) cdes.getExpression();
 
-                    if (cfboe.getLeftExpression().getClass() == FieldReferenceExpression.class) {
-                        FieldReferenceExpression fre = (FieldReferenceExpression) cfboe.getLeftExpression();
+                        if (cfboe.getLeftExpression().getClass() == FieldReferenceExpression.class) {
+                            FieldReferenceExpression fre = (FieldReferenceExpression) cfboe.getLeftExpression();
 
-                        if ((fre.getType() == PrimitiveType.TYPE_BOOLEAN) && fre.getInternalTypeName().equals(internalTypeName) && fre.getName().equals("$assertionsDisabled")) {
-                            // Remove assert initialization statement
-                            statements.remove(0);
+                            if ((fre.getType() == PrimitiveType.TYPE_BOOLEAN) && fre.getInternalTypeName().equals(internalTypeName) && fre.getName().equals("$assertionsDisabled")) {
+                                // Remove assert initialization statement
+                                statements.getList().removeFirst();
+                            }
                         }
                     }
                 }
@@ -114,7 +113,7 @@ public void visit(StaticInitializerDeclaration declaration) {
             Iterator<FieldDeclarator> fieldDeclaratorIterator = fields.iterator();
 
             while (statementIterator.hasNext()) {
-                statement = statementIterator.next();
+                Statement statement = statementIterator.next();
 
                 if (statement.getClass() != ExpressionStatement.class) {
                     break;
@@ -161,7 +160,7 @@ public void visit(StaticInitializerDeclaration declaration) {
                 }
             }
 
-            if (statements.isEmpty()) {
+            if (statements.size() == 0) {
                 staticDeclaration.setStatements(null);
                 staticDeclaration.setFirstLineNumber(0);
             } else {