Skip to content

Commit 5b7fe82

Browse files
author
emmanue1
committed
Simplify AST exploration
1 parent c1d081a commit 5b7fe82

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

src/main/java/org/jd/core/v1/model/javasyntax/expression/BaseExpression.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ public interface BaseExpression extends Base<Expression> {
6161
default String getName() { return ""; }
6262
default ObjectType getObjectType() { return ObjectType.TYPE_UNDEFINED_OBJECT; }
6363
default String getOperator() { return ""; }
64+
default String getStringValue() { return ""; }
6465
}

src/main/java/org/jd/core/v1/model/javasyntax/expression/StringConstantExpression.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public StringConstantExpression(int lineNumber, String string) {
2424
this.string = string;
2525
}
2626

27-
public String getString() {
27+
@Override
28+
public String getStringValue() {
2829
return string;
2930
}
3031

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
@@ -960,7 +960,7 @@ protected Expression createObjectTypeReferenceDotClassExpression(int lineNumber,
960960
}
961961
}
962962

963-
String typeName = ((StringConstantExpression) mie.getParameters()).getString();
963+
String typeName = mie.getParameters().getStringValue();
964964
ObjectType ot = typeMaker.makeFromInternalTypeName(typeName.replace('.', '/'));
965965

966966
return new TypeReferenceDotClassExpression(lineNumber, ot);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static void makeSwitchString(LocalVariableMaker localVariableMaker, State
8585
break;
8686
}
8787

88-
String string = ((StringConstantExpression) expression).getString();
88+
String string = expression.getStringValue();
8989

9090
expression = stmt.getStatements().getFirst().getExpression().getRightExpression();
9191

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ public void visit(PreOperatorExpression expression) {
558558
@Override
559559
public void visit(StringConstantExpression expression) {
560560
tokens.addLineNumberToken(expression);
561-
tokens.add(new StringConstantToken(StringUtil.escapeString(expression.getString()), currentInternalTypeName));
561+
tokens.add(new StringConstantToken(StringUtil.escapeString(expression.getStringValue()), currentInternalTypeName));
562562
}
563563

564564
@Override

0 commit comments

Comments
 (0)