Refactoring

emmanue1 · emmanue1 · commit 0da2e5182c7d · 2020-02-23T21:02:51.000+01:00
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/AbstractJavaSyntaxVisitor.java b/src/main/java/org/jd/core/v1/model/javasyntax/AbstractJavaSyntaxVisitor.java
@@ -637,7 +637,7 @@ public void visit(TypeParameters parameters) {
             iterator.next().accept(this);
     }
 
-    protected void visit(TypeDeclaration declaration) {
+    public void visit(TypeDeclaration declaration) {
         safeAccept(declaration.getAnnotationReferences());
     }
 
@@ -653,64 +653,64 @@ public void visit(Types types) {
         }
     }
 
-    protected void acceptListDeclaration(List<? extends Declaration> list) {
+    public void acceptListDeclaration(List<? extends Declaration> list) {
         for (Declaration declaration : list)
             declaration.accept(this);
     }
 
-    protected void acceptListExpression(List<? extends Expression> list) {
+    public void acceptListExpression(List<? extends Expression> list) {
         for (Expression expression : list)
             expression.accept(this);
     }
 
-    protected void acceptListReference(List<? extends Reference> list) {
+    public void acceptListReference(List<? extends Reference> list) {
         for (Reference reference : list)
             reference.accept(this);
     }
 
-    protected void acceptListStatement(List<? extends Statement> list) {
+    public void acceptListStatement(List<? extends Statement> list) {
         for (Statement statement : list)
             statement.accept(this);
     }
 
-    protected void safeAccept(Declaration declaration) {
+    public void safeAccept(Declaration declaration) {
         if (declaration != null)
             declaration.accept(this);
     }
 
-    protected void safeAccept(BaseExpression expression) {
+    public void safeAccept(BaseExpression expression) {
         if (expression != null)
             expression.accept(this);
     }
 
-    protected void safeAccept(Reference reference) {
+    public void safeAccept(Reference reference) {
         if (reference != null)
             reference.accept(this);
     }
 
-    protected void safeAccept(BaseStatement list) {
+    public void safeAccept(BaseStatement list) {
         if (list != null)
             list.accept(this);
     }
 
-    protected void safeAccept(BaseType list) {
+    public void safeAccept(BaseType list) {
         if (list != null)
             list.accept(this);
     }
 
-    protected void safeAccept(BaseTypeParameter list) {
+    public void safeAccept(BaseTypeParameter list) {
         if (list != null)
             list.accept(this);
     }
 
-    protected void safeAcceptListDeclaration(List<? extends Declaration> list) {
+    public void safeAcceptListDeclaration(List<? extends Declaration> list) {
         if (list != null) {
             for (Declaration declaration : list)
                 declaration.accept(this);
         }
     }
 
-    protected void safeAcceptListStatement(List<? extends Statement> list) {
+    public void safeAcceptListStatement(List<? extends Statement> list) {
         if (list != null) {
             for (Statement statement : list)
                 statement.accept(this);
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateJavaSyntaxTreeStep0Visitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateJavaSyntaxTreeStep0Visitor.java
@@ -9,18 +9,24 @@
 
 import org.jd.core.v1.model.javasyntax.AbstractJavaSyntaxVisitor;
 import org.jd.core.v1.model.javasyntax.declaration.*;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileBodyDeclaration;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
 
 public class UpdateJavaSyntaxTreeStep0Visitor extends AbstractJavaSyntaxVisitor {
-    protected UpdateOuterFieldTypeVisitor updateSyntheticMemberVisitor;
+    protected UpdateOuterFieldTypeVisitor updateOuterFieldTypeVisitor;
 
     public UpdateJavaSyntaxTreeStep0Visitor(TypeMaker typeMaker) {
-        updateSyntheticMemberVisitor = new UpdateOuterFieldTypeVisitor(typeMaker);
+        updateOuterFieldTypeVisitor = new UpdateOuterFieldTypeVisitor(typeMaker);
     }
 
     @Override
     public void visit(BodyDeclaration declaration) {
-        updateSyntheticMemberVisitor.visit(declaration);
+        ClassFileBodyDeclaration bodyDeclaration = (ClassFileBodyDeclaration)declaration;
+        boolean genericTypesSupported = (bodyDeclaration.getClassFile().getMajorVersion() >= 49); // (majorVersion >= Java 5)
+
+        if (genericTypesSupported) {
+            updateOuterFieldTypeVisitor.safeAcceptListDeclaration(bodyDeclaration.getInnerTypeDeclarations());
+        }
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateOuterFieldTypeVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateOuterFieldTypeVisitor.java
@@ -37,12 +37,12 @@ public UpdateOuterFieldTypeVisitor(TypeMaker typeMaker) {
     @Override
     public void visit(BodyDeclaration declaration) {
         ClassFileBodyDeclaration bodyDeclaration = (ClassFileBodyDeclaration)declaration;
-        boolean genericTypesSupported = (bodyDeclaration.getClassFile().getMajorVersion() >= 49); // (majorVersion >= Java 5)
 
-        if (genericTypesSupported) {
+        if (!bodyDeclaration.getClassFile().matchAccessFlags(ACC_STATIC)) {
             safeAcceptListDeclaration(bodyDeclaration.getMethodDeclarations());
-            safeAcceptListDeclaration(bodyDeclaration.getInnerTypeDeclarations());
         }
+
+        safeAcceptListDeclaration(bodyDeclaration.getInnerTypeDeclarations());
     }
 
     @Override
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/SingleLineStatementVisitor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/SingleLineStatementVisitor.java
@@ -191,7 +191,7 @@ public void visit(WhileStatement statement) {
         statementCount = 2;
     }
 
-    protected void acceptListStatement(List<? extends Statement> list) {
+    public void acceptListStatement(List<? extends Statement> list) {
         int size = list.size();
 
         switch (size) {
@@ -214,7 +214,7 @@ protected void acceptListStatement(List<? extends Statement> list) {
         }
     }
 
-    protected void safeAcceptListStatement(List<? extends Statement> list) {
+    public void safeAcceptListStatement(List<? extends Statement> list) {
         if (list == null) {
             minLineNumber = maxLineNumber = 0;
         } else {
@@ -284,7 +284,7 @@ public void visit(NewExpression expression) {
         }
     }
 
-    protected void acceptListExpression(List<? extends Expression> list) {
+    public void acceptListExpression(List<? extends Expression> list) {
         int size = list.size();
 
         if (size == 0) {

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ public void visit(TypeParameters parameters) {`
`637`	`637`	`iterator.next().accept(this);`
`638`	`638`	`}`
`639`	`639`
`640`		`- protected void visit(TypeDeclaration declaration) {`
	`640`	`+ public void visit(TypeDeclaration declaration) {`
`641`	`641`	`safeAccept(declaration.getAnnotationReferences());`
`642`	`642`	`}`
`643`	`643`
`@@ -653,64 +653,64 @@ public void visit(Types types) {`
`653`	`653`	`}`
`654`	`654`	`}`
`655`	`655`
`656`		`- protected void acceptListDeclaration(List<? extends Declaration> list) {`
	`656`	`+ public void acceptListDeclaration(List<? extends Declaration> list) {`
`657`	`657`	`for (Declaration declaration : list)`
`658`	`658`	`declaration.accept(this);`
`659`	`659`	`}`
`660`	`660`
`661`		`- protected void acceptListExpression(List<? extends Expression> list) {`
	`661`	`+ public void acceptListExpression(List<? extends Expression> list) {`
`662`	`662`	`for (Expression expression : list)`
`663`	`663`	`expression.accept(this);`
`664`	`664`	`}`
`665`	`665`
`666`		`- protected void acceptListReference(List<? extends Reference> list) {`
	`666`	`+ public void acceptListReference(List<? extends Reference> list) {`
`667`	`667`	`for (Reference reference : list)`
`668`	`668`	`reference.accept(this);`
`669`	`669`	`}`
`670`	`670`
`671`		`- protected void acceptListStatement(List<? extends Statement> list) {`
	`671`	`+ public void acceptListStatement(List<? extends Statement> list) {`
`672`	`672`	`for (Statement statement : list)`
`673`	`673`	`statement.accept(this);`
`674`	`674`	`}`
`675`	`675`
`676`		`- protected void safeAccept(Declaration declaration) {`
	`676`	`+ public void safeAccept(Declaration declaration) {`
`677`	`677`	`if (declaration != null)`
`678`	`678`	`declaration.accept(this);`
`679`	`679`	`}`
`680`	`680`
`681`		`- protected void safeAccept(BaseExpression expression) {`
	`681`	`+ public void safeAccept(BaseExpression expression) {`
`682`	`682`	`if (expression != null)`
`683`	`683`	`expression.accept(this);`
`684`	`684`	`}`
`685`	`685`
`686`		`- protected void safeAccept(Reference reference) {`
	`686`	`+ public void safeAccept(Reference reference) {`
`687`	`687`	`if (reference != null)`
`688`	`688`	`reference.accept(this);`
`689`	`689`	`}`
`690`	`690`
`691`		`- protected void safeAccept(BaseStatement list) {`
	`691`	`+ public void safeAccept(BaseStatement list) {`
`692`	`692`	`if (list != null)`
`693`	`693`	`list.accept(this);`
`694`	`694`	`}`
`695`	`695`
`696`		`- protected void safeAccept(BaseType list) {`
	`696`	`+ public void safeAccept(BaseType list) {`
`697`	`697`	`if (list != null)`
`698`	`698`	`list.accept(this);`
`699`	`699`	`}`
`700`	`700`
`701`		`- protected void safeAccept(BaseTypeParameter list) {`
	`701`	`+ public void safeAccept(BaseTypeParameter list) {`
`702`	`702`	`if (list != null)`
`703`	`703`	`list.accept(this);`
`704`	`704`	`}`
`705`	`705`
`706`		`- protected void safeAcceptListDeclaration(List<? extends Declaration> list) {`
	`706`	`+ public void safeAcceptListDeclaration(List<? extends Declaration> list) {`
`707`	`707`	`if (list != null) {`
`708`	`708`	`for (Declaration declaration : list)`
`709`	`709`	`declaration.accept(this);`
`710`	`710`	`}`
`711`	`711`	`}`
`712`	`712`
`713`		`- protected void safeAcceptListStatement(List<? extends Statement> list) {`
	`713`	`+ public void safeAcceptListStatement(List<? extends Statement> list) {`
`714`	`714`	`if (list != null) {`
`715`	`715`	`for (Statement statement : list)`
`716`	`716`	`statement.accept(this);`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ public UpdateOuterFieldTypeVisitor(TypeMaker typeMaker) {`
`37`	`37`	`@Override`
`38`	`38`	`public void visit(BodyDeclaration declaration) {`
`39`	`39`	`ClassFileBodyDeclaration bodyDeclaration = (ClassFileBodyDeclaration)declaration;`
`40`		`- boolean genericTypesSupported = (bodyDeclaration.getClassFile().getMajorVersion() >= 49); // (majorVersion >= Java 5)`
`41`	`40`
`42`		`- if (genericTypesSupported) {`
	`41`	`+ if (!bodyDeclaration.getClassFile().matchAccessFlags(ACC_STATIC)) {`
`43`	`42`	`safeAcceptListDeclaration(bodyDeclaration.getMethodDeclarations());`
`44`		`- safeAcceptListDeclaration(bodyDeclaration.getInnerTypeDeclarations());`
`45`	`43`	`}`
	`44`	`+`
	`45`	`+ safeAcceptListDeclaration(bodyDeclaration.getInnerTypeDeclarations());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public void visit(WhileStatement statement) {`
`191`	`191`	`statementCount = 2;`
`192`	`192`	`}`
`193`	`193`
`194`		`- protected void acceptListStatement(List<? extends Statement> list) {`
	`194`	`+ public void acceptListStatement(List<? extends Statement> list) {`
`195`	`195`	`int size = list.size();`
`196`	`196`
`197`	`197`	`switch (size) {`
`@@ -214,7 +214,7 @@ protected void acceptListStatement(List<? extends Statement> list) {`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`217`		`- protected void safeAcceptListStatement(List<? extends Statement> list) {`
	`217`	`+ public void safeAcceptListStatement(List<? extends Statement> list) {`
`218`	`218`	`if (list == null) {`
`219`	`219`	`minLineNumber = maxLineNumber = 0;`
`220`	`220`	`} else {`
`@@ -284,7 +284,7 @@ public void visit(NewExpression expression) {`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`- protected void acceptListExpression(List<? extends Expression> list) {`
	`287`	`+ public void acceptListExpression(List<? extends Expression> list) {`
`288`	`288`	`int size = list.size();`
`289`	`289`
`290`	`290`	`if (size == 0) {`