Skip to content

Commit b55c932

Browse files
author
emmanue1
committed
Update API for Java modules
1 parent 045c7dd commit b55c932

File tree

14 files changed

+161
-149
lines changed

14 files changed

+161
-149
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ Printer printer = new Printer() {
8686
@Override public void printNumericConstant(String constant) { sb.append(constant); }
8787
@Override public void printStringConstant(String constant, String ownerInternalName) { sb.append(constant); }
8888
@Override public void printKeyword(String keyword) { sb.append(keyword); }
89-
@Override public void printDeclaration(int flags, String internalTypeName, String name, String descriptor) { sb.append(name); }
90-
@Override public void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName) { sb.append(name); }
89+
@Override public void printDeclaration(int type, String internalTypeName, String name, String descriptor) { sb.append(name); }
90+
@Override public void printReference(int type, String internalTypeName, String name, String descriptor, String ownerInternalName) { sb.append(name); }
9191

9292
@Override public void indent() { this.indentationCount++; }
93-
@Override public void unindent() { if (this.indentationCount > 0) this.indentationCount--; }
93+
@Override public void unindent() { this.indentationCount--; }
9494

9595
@Override public void startLine(int lineNumber) { for (int i=0; i<indentationCount; i++) sb.append(TAB); }
9696
@Override public void endLine() { sb.append(NEWLINE); }

‎src/main/java/org/jd/core/v1/api/printer/Printer.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
public interface Printer {
1212
int UNKNOWN_LINE_NUMBER = 0;
1313

14-
// Declaration & reference flags
15-
int TYPE_FLAG = 1;
16-
int FIELD_FLAG = 2;
17-
int METHOD_FLAG = 4;
18-
int CONSTRUCTOR_FLAG = 8;
14+
// Declaration & reference types
15+
int TYPE = 1;
16+
int FIELD = 2;
17+
int METHOD = 3;
18+
int CONSTRUCTOR = 4;
19+
int PACKAGE = 5;
20+
int MODULE = 6;
1921

2022
// Marker types
21-
int COMMENT_TYPE = 1;
22-
int JAVADOC_TYPE = 2;
23-
int ERROR_TYPE = 3;
24-
int IMPORT_STATEMENTS_TYPE = 4;
23+
int COMMENT = 1;
24+
int JAVADOC = 2;
25+
int ERROR = 3;
26+
int IMPORT_STATEMENTS = 4;
2527

2628
void start(int maxLineNumber, int majorVersion, int minorVersion);
2729
void end();
@@ -31,8 +33,8 @@ public interface Printer {
3133
void printStringConstant(String constant, String ownerInternalName);
3234
void printKeyword(String keyword);
3335

34-
void printDeclaration(int flags, String internalTypeName, String name, String descriptor);
35-
void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName);
36+
void printDeclaration(int type, String internalTypeName, String name, String descriptor);
37+
void printReference(int type, String internalTypeName, String name, String descriptor, String ownerInternalName);
3638

3739
void indent();
3840
void unindent();

‎src/main/java/org/jd/core/v1/model/token/DeclarationToken.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,28 @@
1010
import org.jd.core.v1.api.printer.Printer;
1111

1212
public class DeclarationToken implements Token {
13-
14-
public static final int TYPE_FLAG = Printer.TYPE_FLAG;
15-
public static final int FIELD_FLAG = Printer.FIELD_FLAG;
16-
public static final int METHOD_FLAG = Printer.METHOD_FLAG;
17-
public static final int CONSTRUCTOR_FLAG = Printer.CONSTRUCTOR_FLAG;
18-
19-
protected int flags;
13+
// Declaration & reference types
14+
public static final int TYPE = Printer.TYPE;
15+
public static final int FIELD = Printer.FIELD;
16+
public static final int METHOD = Printer.METHOD;
17+
public static final int CONSTRUCTOR = Printer.CONSTRUCTOR;
18+
public static final int PACKAGE = Printer.PACKAGE;
19+
public static final int MODULE = Printer.MODULE;
20+
21+
protected int type;
2022
protected String internalTypeName;
2123
protected String name;
2224
protected String descriptor;
2325

24-
public DeclarationToken(int flags, String internalTypeName, String name, String descriptor) {
25-
this.flags = flags;
26+
public DeclarationToken(int type, String internalTypeName, String name, String descriptor) {
27+
this.type = type;
2628
this.internalTypeName = internalTypeName;
2729
this.name = name;
2830
this.descriptor = descriptor;
2931
}
3032

31-
public int getFlags() {
32-
return flags;
33+
public int getType() {
34+
return type;
3335
}
3436

3537
public String getInternalTypeName() {

‎src/main/java/org/jd/core/v1/model/token/EndMarkerToken.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
public class EndMarkerToken implements Token {
1313

14-
public static final EndMarkerToken COMMENT = new EndMarkerToken(Printer.COMMENT_TYPE);
15-
public static final EndMarkerToken JAVADOC = new EndMarkerToken(Printer.JAVADOC_TYPE);
16-
public static final EndMarkerToken ERROR = new EndMarkerToken(Printer.ERROR_TYPE);
17-
public static final EndMarkerToken IMPORT_STATEMENTS = new EndMarkerToken(Printer.IMPORT_STATEMENTS_TYPE);
14+
public static final EndMarkerToken COMMENT = new EndMarkerToken(Printer.COMMENT);
15+
public static final EndMarkerToken JAVADOC = new EndMarkerToken(Printer.JAVADOC);
16+
public static final EndMarkerToken ERROR = new EndMarkerToken(Printer.ERROR);
17+
public static final EndMarkerToken IMPORT_STATEMENTS = new EndMarkerToken(Printer.IMPORT_STATEMENTS);
1818

1919
protected int type;
2020

‎src/main/java/org/jd/core/v1/model/token/ReferenceToken.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ public class ReferenceToken extends DeclarationToken {
1212
protected String ownerInternalName;
1313

1414
/**
15-
* @param flags @see org.jd.core.v1.model.token.DeclarationToken
15+
* @param type @see org.jd.core.v1.model.token.DeclarationToken
1616
* @param internalTypeName
1717
* @param name
1818
* @param descriptor
1919
* @param ownerInternalName
2020
*/
21-
public ReferenceToken(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName) {
22-
super(flags, internalTypeName, name, descriptor);
21+
public ReferenceToken(int type, String internalTypeName, String name, String descriptor, String ownerInternalName) {
22+
super(type, internalTypeName, name, descriptor);
2323
this.ownerInternalName = ownerInternalName;
2424
}
2525

‎src/main/java/org/jd/core/v1/model/token/StartMarkerToken.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
public class StartMarkerToken implements Token {
1313

14-
public static final StartMarkerToken COMMENT = new StartMarkerToken(Printer.COMMENT_TYPE);
15-
public static final StartMarkerToken JAVADOC = new StartMarkerToken(Printer.JAVADOC_TYPE);
16-
public static final StartMarkerToken ERROR = new StartMarkerToken(Printer.ERROR_TYPE);
17-
public static final StartMarkerToken IMPORT_STATEMENTS = new StartMarkerToken(Printer.IMPORT_STATEMENTS_TYPE);
14+
public static final StartMarkerToken COMMENT = new StartMarkerToken(Printer.COMMENT);
15+
public static final StartMarkerToken JAVADOC = new StartMarkerToken(Printer.JAVADOC);
16+
public static final StartMarkerToken ERROR = new StartMarkerToken(Printer.ERROR);
17+
public static final StartMarkerToken IMPORT_STATEMENTS = new StartMarkerToken(Printer.IMPORT_STATEMENTS);
1818

1919
protected int type;
2020

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void visit(ConstructorReferenceExpression expression) {
144144
tokens.addLineNumberToken(expression);
145145
tokens.add(newTypeReferenceToken(ot, currentInternalTypeName));
146146
tokens.add(TextToken.COLON_COLON);
147-
//tokens.add(new ReferenceToken(ReferenceToken.CONSTRUCTOR_FLAG, ot.getInternalName(), "new", expression.getDescriptor(), currentInternalTypeName));
147+
//tokens.add(new ReferenceToken(ReferenceToken.CONSTRUCTOR, ot.getInternalName(), "new", expression.getDescriptor(), currentInternalTypeName));
148148
tokens.add(NEW);
149149
}
150150

@@ -160,7 +160,7 @@ public void visit(EnumConstantReferenceExpression expression) {
160160

161161
ObjectType type = expression.getObjectType();
162162

163-
tokens.add(new ReferenceToken(ReferenceToken.FIELD_FLAG, type.getInternalName(), expression.getName(), type.getDescriptor(), currentInternalTypeName));
163+
tokens.add(new ReferenceToken(ReferenceToken.FIELD, type.getInternalName(), expression.getName(), type.getDescriptor(), currentInternalTypeName));
164164
}
165165

166166
@Override
@@ -205,7 +205,7 @@ public void visit(FieldReferenceExpression expression) {
205205
tokens.add(TextToken.DOT);
206206
}
207207

208-
tokens.add(new ReferenceToken(ReferenceToken.FIELD_FLAG, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
208+
tokens.add(new ReferenceToken(ReferenceToken.FIELD, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
209209
}
210210
}
211211

@@ -372,7 +372,7 @@ public void visit(MethodInvocationExpression expression) {
372372
}
373373

374374
tokens.addLineNumberToken(expression);
375-
tokens.add(new ReferenceToken(ReferenceToken.METHOD_FLAG, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
375+
tokens.add(new ReferenceToken(ReferenceToken.METHOD, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
376376
tokens.add(StartBlockToken.START_PARAMETERS_BLOCK);
377377

378378
if (parameters != null) {
@@ -387,7 +387,7 @@ public void visit(MethodReferenceExpression expression) {
387387
expression.getExpression().accept(this);
388388
tokens.addLineNumberToken(expression);
389389
tokens.add(TextToken.COLON_COLON);
390-
tokens.add(new ReferenceToken(ReferenceToken.METHOD_FLAG, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
390+
tokens.add(new ReferenceToken(ReferenceToken.METHOD, expression.getInternalTypeName(), expression.getName(), expression.getDescriptor(), currentInternalTypeName));
391391
}
392392

393393
@Override

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void visit(InnerObjectType type) {
118118
}
119119

120120
// Build token for type reference
121-
tokens.add(new ReferenceToken(ReferenceToken.TYPE_FLAG, type.getInternalName(), type.getName(), null, currentInternalTypeName));
121+
tokens.add(new ReferenceToken(ReferenceToken.TYPE, type.getInternalName(), type.getName(), null, currentInternalTypeName));
122122

123123
// Build token for type arguments
124124
visitTypeArgumentList(type.getTypeArguments());
@@ -221,16 +221,16 @@ protected ReferenceToken newTypeReferenceToken(ObjectType ot, String ownerIntern
221221

222222
if (packageContainsType(internalPackageName, internalName)) {
223223
// In the current package
224-
return new ReferenceToken(ReferenceToken.TYPE_FLAG, internalName, name, null, ownerInternalName);
224+
return new ReferenceToken(ReferenceToken.TYPE, internalName, name, null, ownerInternalName);
225225
} else {
226226
if (packageContainsType("java/lang/", internalName)) {
227227
// A 'java.lang' class
228228
String internalLocalTypeName = internalPackageName + name;
229229

230230
if (loader.canLoad(internalLocalTypeName)) {
231-
return new ReferenceToken(ReferenceToken.TYPE_FLAG, internalName, qualifiedName, null, ownerInternalName);
231+
return new ReferenceToken(ReferenceToken.TYPE, internalName, qualifiedName, null, ownerInternalName);
232232
} else {
233-
return new ReferenceToken(ReferenceToken.TYPE_FLAG, internalName, name, null, ownerInternalName);
233+
return new ReferenceToken(ReferenceToken.TYPE, internalName, name, null, ownerInternalName);
234234
}
235235
} else {
236236
return new TypeReferenceToken(importsFragment, internalName, qualifiedName, name, ownerInternalName);
@@ -251,7 +251,7 @@ private static class TypeReferenceToken extends ReferenceToken {
251251
protected String qualifiedName;
252252

253253
public TypeReferenceToken(ImportsFragment importsFragment, String internalTypeName, String qualifiedName, String name, String ownerInternalName) {
254-
super(TYPE_FLAG, internalTypeName, name, null, ownerInternalName);
254+
super(TYPE, internalTypeName, name, null, ownerInternalName);
255255
this.importsFragment = importsFragment;
256256
this.qualifiedName = qualifiedName;
257257
}

‎src/main/java/org/jd/core/v1/service/tokenizer/javafragmenttotoken/visitor/TokenizeJavaFragmentVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public void visit(ImportsFragment fragment) {
277277
for (ImportsFragment.Import imp : imports) {
278278
tokens.add(IMPORT);
279279
tokens.add(TextToken.SPACE);
280-
tokens.add(new ReferenceToken(ReferenceToken.TYPE_FLAG, imp.getInternalName(), imp.getQualifiedName(), null, null));
280+
tokens.add(new ReferenceToken(ReferenceToken.TYPE, imp.getInternalName(), imp.getQualifiedName(), null, null));
281281
tokens.add(TextToken.SEMICOLON);
282282
tokens.add(NewLineToken.NEWLINE_1);
283283
}

‎src/main/java/org/jd/core/v1/service/writer/visitor/PrintTokenVisitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void visit(CharacterConstantToken token) {
5151
@Override
5252
public void visit(DeclarationToken token) {
5353
prepareNewLine();
54-
printer.printDeclaration(token.getFlags(), token.getInternalTypeName(), token.getName(), token.getDescriptor());
54+
printer.printDeclaration(token.getType(), token.getInternalTypeName(), token.getName(), token.getDescriptor());
5555
index++;
5656
}
5757

@@ -119,7 +119,7 @@ public void visit(NumericConstantToken token) {
119119
@Override
120120
public void visit(ReferenceToken token) {
121121
prepareNewLine();
122-
printer.printReference(token.getFlags(), token.getInternalTypeName(), token.getName(), token.getDescriptor(), token.getOwnerInternalName());
122+
printer.printReference(token.getType(), token.getInternalTypeName(), token.getName(), token.getDescriptor(), token.getOwnerInternalName());
123123
index++;
124124
}
125125

0 commit comments

Comments
 (0)