From 45c415d5bb46ef8e22a50c90081fe2edb3f5da6b Mon Sep 17 00:00:00 2001 From: Danny van Bruggen Date: Wed, 1 May 2019 22:29:59 +0200 Subject: [PATCH] Fix build --- .../com/github/javaparser/ast/expr/SuperExpr.java | 8 ++++++-- .../com/github/javaparser/ast/expr/ThisExpr.java | 8 ++++++-- .../javaparser/ast/observer/ObservableProperty.java | 2 +- .../github/javaparser/ast/visitor/CloneVisitor.java | 8 ++++---- .../javaparser/ast/visitor/ModifierVisitor.java | 8 ++++---- .../javaparser/metamodel/JavaParserMetaModel.java | 12 ++++++------ .../javaparser/metamodel/SuperExprMetaModel.java | 2 +- .../javaparser/metamodel/ThisExprMetaModel.java | 2 +- .../javaparser/printer/ConcreteSyntaxModel.java | 4 ++-- 9 files changed, 31 insertions(+), 23 deletions(-) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java index 9a22aae841..f80c362508 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java @@ -91,7 +91,7 @@ public SuperExpr setTypeName(final Name typeName) { if (typeName == this.typeName) { return (SuperExpr) this; } - notifyPropertyChange(ObservableProperty.CLASS_NAME, this.typeName, typeName); + notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName); if (this.typeName != null) this.typeName.setParentNode(null); this.typeName = typeName; @@ -106,7 +106,7 @@ public boolean remove(Node node) { return false; if (typeName != null) { if (node == typeName) { - removeClassName(); + removeTypeName(); return true; } } @@ -166,4 +166,8 @@ public boolean replace(Node node, Node replacementNode) { } return super.replace(node, replacementNode); } + + public SuperExpr removeTypeName() { + return setTypeName((Name) null); + } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java index 3f23b101a9..7a1218764d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java @@ -93,7 +93,7 @@ public ThisExpr setTypeName(final Name typeName) { if (typeName == this.typeName) { return (ThisExpr) this; } - notifyPropertyChange(ObservableProperty.CLASS_NAME, this.typeName, typeName); + notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName); if (this.typeName != null) this.typeName.setParentNode(null); this.typeName = typeName; @@ -108,7 +108,7 @@ public boolean remove(Node node) { return false; if (typeName != null) { if (node == typeName) { - removeClassName(); + removeTypeName(); return true; } } @@ -173,4 +173,8 @@ public ResolvedTypeDeclaration resolve() { public Optional toThisExpr() { return Optional.of(this); } + + public ThisExpr removeTypeName() { + return setTypeName((Name) null); + } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java index 4373a1ea61..e644503b96 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java @@ -44,7 +44,6 @@ public enum ObservableProperty { CHECK(Type.SINGLE_REFERENCE), CLASS_BODY(Type.MULTIPLE_REFERENCE), CLASS_DECLARATION(Type.SINGLE_REFERENCE), - CLASS_NAME(Type.SINGLE_REFERENCE), COMMENT(Type.SINGLE_REFERENCE), COMPARE(Type.SINGLE_REFERENCE), COMPONENT_TYPE(Type.SINGLE_REFERENCE), @@ -111,6 +110,7 @@ public enum ObservableProperty { TYPES(Type.MULTIPLE_REFERENCE), TYPE_ARGUMENTS(Type.MULTIPLE_REFERENCE), TYPE_BOUND(Type.MULTIPLE_REFERENCE), + TYPE_NAME(Type.SINGLE_REFERENCE), TYPE_PARAMETERS(Type.MULTIPLE_REFERENCE), UPDATE(Type.MULTIPLE_REFERENCE), VALUE(Type.SINGLE_REFERENCE), diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java index 43057a0d03..d834b4202c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java @@ -598,9 +598,9 @@ public Visitable visit(final SimpleName n, final Object arg) { @Override public Visitable visit(final ThisExpr n, final Object arg) { - Name className = cloneNode(n.getTypeName(), arg); + Name typeName = cloneNode(n.getTypeName(), arg); Comment comment = cloneNode(n.getComment(), arg); - ThisExpr r = new ThisExpr(n.getTokenRange().orElse(null), className); + ThisExpr r = new ThisExpr(n.getTokenRange().orElse(null), typeName); r.setComment(comment); copyData(n, r); return r; @@ -608,9 +608,9 @@ public Visitable visit(final ThisExpr n, final Object arg) { @Override public Visitable visit(final SuperExpr n, final Object arg) { - Name className = cloneNode(n.getTypeName(), arg); + Name typeName = cloneNode(n.getTypeName(), arg); Comment comment = cloneNode(n.getComment(), arg); - SuperExpr r = new SuperExpr(n.getTokenRange().orElse(null), className); + SuperExpr r = new SuperExpr(n.getTokenRange().orElse(null), typeName); r.setComment(comment); copyData(n, r); return r; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java index d2d03568f8..ad7e0ae9bd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java @@ -830,9 +830,9 @@ public Visitable visit(final StringLiteralExpr n, final A arg) { @Override public Visitable visit(final SuperExpr n, final A arg) { - Name className = n.getTypeName().map(s -> (Name) s.accept(this, arg)).orElse(null); + Name typeName = n.getTypeName().map(s -> (Name) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - n.setTypeName(className); + n.setTypeName(typeName); n.setComment(comment); return n; } @@ -876,9 +876,9 @@ public Visitable visit(final SynchronizedStmt n, final A arg) { @Override public Visitable visit(final ThisExpr n, final A arg) { - Name className = n.getTypeName().map(s -> (Name) s.accept(this, arg)).orElse(null); + Name typeName = n.getTypeName().map(s -> (Name) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - n.setTypeName(className); + n.setTypeName(typeName); n.setComment(comment); return n; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java index 3280a9cd5f..69e1ec2ce0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java @@ -162,8 +162,8 @@ private static void initializeConstructorParameters() { simpleNameMetaModel.getConstructorParameters().add(simpleNameMetaModel.identifierPropertyMetaModel); singleMemberAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel); singleMemberAnnotationExprMetaModel.getConstructorParameters().add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel); - superExprMetaModel.getConstructorParameters().add(superExprMetaModel.classNamePropertyMetaModel); - thisExprMetaModel.getConstructorParameters().add(thisExprMetaModel.classNamePropertyMetaModel); + superExprMetaModel.getConstructorParameters().add(superExprMetaModel.typeNamePropertyMetaModel); + thisExprMetaModel.getConstructorParameters().add(thisExprMetaModel.typeNamePropertyMetaModel); typeExprMetaModel.getConstructorParameters().add(typeExprMetaModel.typePropertyMetaModel); unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.expressionPropertyMetaModel); unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.operatorPropertyMetaModel); @@ -587,10 +587,10 @@ private static void initializePropertyMetaModels() { simpleNameMetaModel.getDeclaredPropertyMetaModels().add(simpleNameMetaModel.identifierPropertyMetaModel); singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel = new PropertyMetaModel(singleMemberAnnotationExprMetaModel, "memberValue", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); singleMemberAnnotationExprMetaModel.getDeclaredPropertyMetaModels().add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel); - superExprMetaModel.classNamePropertyMetaModel = new PropertyMetaModel(superExprMetaModel, "className", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false); - superExprMetaModel.getDeclaredPropertyMetaModels().add(superExprMetaModel.classNamePropertyMetaModel); - thisExprMetaModel.classNamePropertyMetaModel = new PropertyMetaModel(thisExprMetaModel, "className", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false); - thisExprMetaModel.getDeclaredPropertyMetaModels().add(thisExprMetaModel.classNamePropertyMetaModel); + superExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(superExprMetaModel, "typeName", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false); + superExprMetaModel.getDeclaredPropertyMetaModels().add(superExprMetaModel.typeNamePropertyMetaModel); + thisExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(thisExprMetaModel, "typeName", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false); + thisExprMetaModel.getDeclaredPropertyMetaModels().add(thisExprMetaModel.typeNamePropertyMetaModel); typeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(typeExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); typeExprMetaModel.getDeclaredPropertyMetaModels().add(typeExprMetaModel.typePropertyMetaModel); unaryExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java index 11b42e78bb..8ec95652a1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java @@ -8,5 +8,5 @@ public class SuperExprMetaModel extends ExpressionMetaModel { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.SuperExpr.class, "SuperExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel classNamePropertyMetaModel; + public PropertyMetaModel typeNamePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java index d6a92e9716..660f5dcdfa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java @@ -8,5 +8,5 @@ public class ThisExprMetaModel extends ExpressionMetaModel { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ThisExpr.class, "ThisExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel classNamePropertyMetaModel; + public PropertyMetaModel typeNamePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java index bf3dd97cec..18538c8796 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java @@ -473,13 +473,13 @@ private static CsmElement typeArguments() { concreteSyntaxModelByClass.put(SuperExpr.class, sequence( comment(), - conditional(CLASS_NAME, IS_PRESENT, sequence(child(CLASS_NAME), token(GeneratedJavaParserConstants.DOT))), + conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.SUPER) )); concreteSyntaxModelByClass.put(ThisExpr.class, sequence( comment(), - conditional(CLASS_NAME, IS_PRESENT, sequence(child(CLASS_NAME), token(GeneratedJavaParserConstants.DOT))), + conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.THIS) ));