Skip to content

Commit f831a96

Browse files
author
emmanue1
committed
Cleanup
1 parent 179984e commit f831a96

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
760760
}
761761
if (TYPE_VOID.equals(returnedType)) {
762762
if ((opcode == 183) && // INVOKESPECIAL
763-
"<init>".equals(name)) {
763+
"<init>".equals(name)) {
764764

765765
if (expression1.getClass() == NewExpression.class) {
766766
((NewExpression) expression1).setParameters(parameters);
@@ -774,7 +774,7 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
774774
}
775775
} else {
776776
if ((opcode == 182) && // INVOKEVIRTUAL
777-
"toString".equals(name) && "()Ljava/lang/String;".equals(descriptor)) {
777+
"toString".equals(name) && "()Ljava/lang/String;".equals(descriptor)) {
778778
typeName = constants.getConstantTypeName(constantMemberRef.getClassIndex());
779779
if ("java/lang/StringBuilder".equals(typeName) || "java/lang/StringBuffer".equals(typeName)) {
780780
stack.push(CreateConcatStringUtil.create(expression1, lineNumber, typeName));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Statements make(ControlFlowGraph cfg) {
107107

108108
localVariableMaker.popFrame();
109109

110-
// Update integer constant type to 'byte', 'char', 'short', 'int'
110+
// Update integer constant type to 'byte', 'char', 'short' or 'int'
111111
statements.accept(updateIntegerConstantTypeVisitor);
112112

113113
// Change ++i; with i++;

‎src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/CompilationUnitVisitor.java‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.Iterator;
2525
import java.util.List;
2626

27+
import static org.jd.core.v1.model.javasyntax.declaration.Declaration.*;
28+
2729
public class CompilationUnitVisitor extends StatementVisitor {
2830
public static final KeywordToken ABSTRACT = new KeywordToken("abstract");
2931
public static final KeywordToken ANNOTATION = new KeywordToken("@interface");
@@ -54,10 +56,10 @@ public CompilationUnitVisitor(Loader loader, String mainInternalTypeName, Import
5456

5557
@Override
5658
public void visit(AnnotationDeclaration declaration) {
57-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
59+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
5860
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_TYPE_BLOCK);
5961

60-
buildFragmentsForTypeDeclaration(declaration, declaration.getFlags() & ~Declaration.FLAG_ABSTRACT, ANNOTATION);
62+
buildFragmentsForTypeDeclaration(declaration, declaration.getFlags() & ~FLAG_ABSTRACT, ANNOTATION);
6163

6264
fragments.addTokensFragment(tokens);
6365

@@ -207,7 +209,7 @@ public void visit(BodyDeclaration declaration) {
207209

208210
@Override
209211
public void visit(ClassDeclaration declaration) {
210-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
212+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
211213
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_TYPE_BLOCK);
212214

213215
buildFragmentsForClassOrInterfaceDeclaration(declaration, declaration.getFlags(), CLASS);
@@ -318,7 +320,7 @@ public void visit(CompilationUnit compilationUnit) {
318320

319321
@Override
320322
public void visit(ConstructorDeclaration declaration) {
321-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC|Declaration.FLAG_BRIDGE)) == 0) {
323+
if ((declaration.getFlags() & (FLAG_SYNTHETIC|FLAG_BRIDGE)) == 0) {
322324
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_METHOD_BLOCK);
323325

324326
tokens = new Tokens();
@@ -463,7 +465,7 @@ public void visit(ElementValuePair reference) {
463465

464466
@Override
465467
public void visit(EnumDeclaration declaration) {
466-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
468+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
467469
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_TYPE_BLOCK);
468470

469471
buildFragmentsForTypeDeclaration(declaration, declaration.getFlags(), ENUM);
@@ -605,7 +607,7 @@ public void visit(ExpressionVariableInitializer declaration) {
605607

606608
@Override
607609
public void visit(FieldDeclaration declaration) {
608-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
610+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
609611
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_FIELD_BLOCK);
610612

611613
tokens = new Tokens();
@@ -755,10 +757,10 @@ public void visit(InstanceInitializerDeclaration declaration) {
755757

756758
@Override
757759
public void visit(InterfaceDeclaration declaration) {
758-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
760+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
759761
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_TYPE_BLOCK);
760762

761-
buildFragmentsForClassOrInterfaceDeclaration(declaration, declaration.getFlags() & ~Declaration.FLAG_ABSTRACT, INTERFACE);
763+
buildFragmentsForClassOrInterfaceDeclaration(declaration, declaration.getFlags() & ~FLAG_ABSTRACT, INTERFACE);
762764

763765
tokens.add(StartBlockToken.START_DECLARATION_OR_STATEMENT_BLOCK);
764766

@@ -882,7 +884,7 @@ public void visit(MemberDeclarations list) {
882884

883885
@Override
884886
public void visit(MethodDeclaration declaration) {
885-
if ((declaration.getFlags() & (Declaration.FLAG_SYNTHETIC | Declaration.FLAG_BRIDGE)) == 0) {
887+
if ((declaration.getFlags() & (FLAG_SYNTHETIC | FLAG_BRIDGE)) == 0) {
886888
fragments.add(StartMovableJavaBlockFragment.START_MOVABLE_METHOD_BLOCK);
887889

888890
tokens = new Tokens();
@@ -1083,41 +1085,41 @@ protected void buildFragmentsForClassOrInterfaceDeclaration(InterfaceDeclaration
10831085
}
10841086

10851087
protected void buildTokensForAccessFlags(int flags) {
1086-
if ((flags & Declaration.FLAG_PUBLIC) != 0) {
1088+
if ((flags & FLAG_PUBLIC) != 0) {
10871089
tokens.add(PUBLIC);
10881090
tokens.add(TextToken.SPACE);
10891091
}
1090-
if ((flags & Declaration.FLAG_PRIVATE) != 0) {
1092+
if ((flags & FLAG_PRIVATE) != 0) {
10911093
tokens.add(PRIVATE);
10921094
tokens.add(TextToken.SPACE);
10931095
}
1094-
if ((flags & Declaration.FLAG_PROTECTED) != 0) {
1096+
if ((flags & FLAG_PROTECTED) != 0) {
10951097
tokens.add(PROTECTED);
10961098
tokens.add(TextToken.SPACE);
10971099
}
1098-
if ((flags & Declaration.FLAG_STATIC) != 0) {
1100+
if ((flags & FLAG_STATIC) != 0) {
10991101
tokens.add(STATIC);
11001102
tokens.add(TextToken.SPACE);
11011103
}
1102-
if ((flags & Declaration.FLAG_FINAL) != 0) {
1104+
if ((flags & FLAG_FINAL) != 0) {
11031105
tokens.add(FINAL);
11041106
tokens.add(TextToken.SPACE);
11051107
}
1106-
if ((flags & Declaration.FLAG_NATIVE) != 0) {
1108+
if ((flags & FLAG_NATIVE) != 0) {
11071109
tokens.add(NATIVE);
11081110
tokens.add(TextToken.SPACE);
11091111
}
1110-
if ((flags & Declaration.FLAG_ABSTRACT) != 0) {
1112+
if ((flags & FLAG_ABSTRACT) != 0) {
11111113
tokens.add(ABSTRACT);
11121114
tokens.add(TextToken.SPACE);
11131115
}
1114-
if ((flags & Declaration.FLAG_BRIDGE) != 0) {
1116+
if ((flags & FLAG_BRIDGE) != 0) {
11151117
tokens.add(StartMarkerToken.COMMENT);
11161118
tokens.add(COMMENT_BRIDGE);
11171119
tokens.add(EndMarkerToken.COMMENT);
11181120
tokens.add(TextToken.SPACE);
11191121
}
1120-
if ((flags & Declaration.FLAG_SYNTHETIC) != 0) {
1122+
if ((flags & FLAG_SYNTHETIC) != 0) {
11211123
tokens.add(StartMarkerToken.COMMENT);
11221124
tokens.add(COMMENT_SYNTHETIC);
11231125
tokens.add(EndMarkerToken.COMMENT);

0 commit comments

Comments
 (0)