Refactoring

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/LocalVariableMaker.java

@@ -45,9 +45,10 @@ public class LocalVariableMaker {
     protected CreateLocalVariableVisitor createLocalVariableVisitor;
 
     @SuppressWarnings("unchecked")
-    public LocalVariableMaker(TypeMaker typeMaker, ClassFileConstructorOrMethodDeclaration comd, boolean constructor, BaseType parameterTypes) {
+    public LocalVariableMaker(TypeMaker typeMaker, ClassFileConstructorOrMethodDeclaration comd, boolean constructor) {
         ClassFile classFile = comd.getClassFile();
         Method method = comd.getMethod();
+        BaseType parameterTypes = comd.getParameterTypes();
 
         this.typeMaker = typeMaker;
         this.typeBounds = comd.getTypeBounds();

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/StatementMaker.java

@@ -61,16 +61,16 @@ public class StatementMaker {
     protected boolean removeFinallyStatementsFlag = false;
     protected boolean mergeTryWithResourcesStatementFlag = false;
 
-    public StatementMaker(
-            TypeMaker typeMaker, LocalVariableMaker localVariableMaker,
-            ClassFile classFile, ClassFileBodyDeclaration bodyDeclaration, ClassFileConstructorOrMethodDeclaration comd) {
+    public StatementMaker(TypeMaker typeMaker, LocalVariableMaker localVariableMaker, ClassFileConstructorOrMethodDeclaration comd) {
+        ClassFile classFile = comd.getClassFile();
+
         this.typeMaker = typeMaker;
         this.typeBounds = comd.getTypeBounds();
         this.localVariableMaker = localVariableMaker;
         this.majorVersion = classFile.getMajorVersion();
         this.internalTypeName = classFile.getInternalTypeName();
-        this.bodyDeclaration = bodyDeclaration;
-        this.byteCodeParser = new ByteCodeParser(typeMaker, localVariableMaker, classFile, bodyDeclaration, comd);
+        this.bodyDeclaration = comd.getBodyDeclaration();
+        this.byteCodeParser = new ByteCodeParser(typeMaker, localVariableMaker, classFile, this.bodyDeclaration, comd);
         this.removeFinallyStatementsVisitor = new RemoveFinallyStatementsVisitor(localVariableMaker);
         this.removeBinaryOpReturnStatementsVisitor = new RemoveBinaryOpReturnStatementsVisitor(localVariableMaker);
         this.updateIntegerConstantTypeVisitor = new UpdateIntegerConstantTypeVisitor(comd.getReturnedType());

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

@@ -87,65 +87,57 @@ public void visit(FieldDeclaration declaration) {}
 
     @Override
     public void visit(ConstructorDeclaration declaration) {
-        ClassFileConstructorOrMethodDeclaration comd = (ClassFileConstructorOrMethodDeclaration)declaration;
-        LocalVariableMaker localVariableMaker = new LocalVariableMaker(typeMaker, comd, true, comd.getParameterTypes());
-
-        createParametersVariablesAndStatements(comd, localVariableMaker);
+        createParametersVariablesAndStatements((ClassFileConstructorOrMethodDeclaration)declaration, true);
     }
 
     @Override
     public void visit(MethodDeclaration declaration) {
-        ClassFileConstructorOrMethodDeclaration comd = (ClassFileConstructorOrMethodDeclaration)declaration;
-        LocalVariableMaker localVariableMaker = new LocalVariableMaker(typeMaker, comd, false, comd.getParameterTypes());
-
-        createParametersVariablesAndStatements(comd, localVariableMaker);
+        createParametersVariablesAndStatements((ClassFileConstructorOrMethodDeclaration)declaration, false);
     }
 
     @Override
     public void visit(StaticInitializerDeclaration declaration) {
-        ClassFileConstructorOrMethodDeclaration comd = (ClassFileConstructorOrMethodDeclaration)declaration;
-        LocalVariableMaker localVariableMaker = new LocalVariableMaker(typeMaker, comd, false, null);
-
-        createParametersVariablesAndStatements(comd, localVariableMaker);
+        createParametersVariablesAndStatements((ClassFileConstructorOrMethodDeclaration)declaration, false);
     }
 
-    protected void createParametersVariablesAndStatements(ClassFileConstructorOrMethodDeclaration comd, LocalVariableMaker localVariableMaker) {
+    protected void createParametersVariablesAndStatements(ClassFileConstructorOrMethodDeclaration comd, boolean constructor) {
         ClassFile classFile = comd.getClassFile();
-        ClassFileBodyDeclaration bodyDeclaration = comd.getBodyDeclaration();
         Method method = comd.getMethod();
-        StatementMaker statementMaker = new StatementMaker(typeMaker, localVariableMaker, classFile, bodyDeclaration, comd);
+        AttributeCode attributeCode = method.getAttribute("Code");
+        LocalVariableMaker localVariableMaker = new LocalVariableMaker(typeMaker, comd, constructor);
 
-        try {
-            ControlFlowGraph cfg = ControlFlowGraphMaker.make(method);
+        if (attributeCode == null) {
+            localVariableMaker.make(false, typeMaker);
+        } else {
+            StatementMaker statementMaker = new StatementMaker(typeMaker, localVariableMaker, comd);
+            boolean containsLineNumber = (attributeCode.getAttribute("LineNumberTable") != null);
 
-            if (cfg != null) {
-                ControlFlowGraphGotoReducer.reduce(cfg);
-                ControlFlowGraphLoopReducer.reduce(cfg);
+            try {
+                ControlFlowGraph cfg = ControlFlowGraphMaker.make(method);
 
-                if (ControlFlowGraphReducer.reduce(cfg)) {
-                    comd.setStatements(statementMaker.make(cfg));
-                } else {
-                    comd.setStatements(new ByteCodeStatement(ByteCodeWriter.write("// ", method)));
+                if (cfg != null) {
+                    ControlFlowGraphGotoReducer.reduce(cfg);
+                    ControlFlowGraphLoopReducer.reduce(cfg);
+
+                    if (ControlFlowGraphReducer.reduce(cfg)) {
+                        comd.setStatements(statementMaker.make(cfg));
+                    } else {
+                        comd.setStatements(new ByteCodeStatement(ByteCodeWriter.write("// ", method)));
+                    }
                 }
+            } catch (Exception e) {
+                assert ExceptionUtil.printStackTrace(e);
+                comd.setStatements(new ByteCodeStatement(ByteCodeWriter.write("// ", method)));
             }
-        } catch (Exception e) {
-            assert ExceptionUtil.printStackTrace(e);
-            comd.setStatements(new ByteCodeStatement(ByteCodeWriter.write("// ", method)));
-        }
 
-        if ((classFile.getAccessFlags() & FLAG_INTERFACE) != 0) {
-            comd.setFlags(comd.getFlags() & ~(FLAG_PUBLIC|FLAG_ABSTRACT));
+            localVariableMaker.make(containsLineNumber, typeMaker);
         }
 
-        boolean containsLineNumber = false;
-        AttributeCode attributeCode = method.getAttribute("Code");
+        comd.setFormalParameters(localVariableMaker.getFormalParameters());
 
-        if (attributeCode != null) {
-            containsLineNumber = (attributeCode.getAttribute("LineNumberTable") != null);
+        if ((classFile.getAccessFlags() & FLAG_INTERFACE) != 0) {
+            comd.setFlags(comd.getFlags() & ~(FLAG_PUBLIC|FLAG_ABSTRACT));
         }
-
-        localVariableMaker.make(containsLineNumber, typeMaker);
-        comd.setFormalParameters(localVariableMaker.getFormalParameters());
     }
 
     @Override