diff options
13 files changed, 21 insertions, 21 deletions
diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java index fa0a0aa1a..23377b89c 100644 --- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java +++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java @@ -2,25 +2,23 @@ package com.github.javaparser.generator.core.node; import com.github.javaparser.JavaParser; import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.generator.NodeGenerator; -import com.github.javaparser.generator.utils.SeparatedItemStringBuilder; import com.github.javaparser.generator.utils.SourceRoot; import com.github.javaparser.metamodel.BaseNodeMetaModel; +import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.PropertyMetaModel; -import java.io.IOException; -import java.util.*; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; -import static com.github.javaparser.JavaParser.parseClassBodyDeclaration; import static com.github.javaparser.ast.Modifier.FINAL; import static com.github.javaparser.generator.utils.GeneratorUtils.camelCaseToScreaming; import static com.github.javaparser.generator.utils.GeneratorUtils.f; -import static com.github.javaparser.generator.utils.GeneratorUtils.optionalOf; public class PropertyGenerator extends NodeGenerator { private final Set<String> observablePropertyNames = new TreeSet<>(); @@ -39,7 +37,7 @@ public class PropertyGenerator extends NodeGenerator { private void generateSetter(BaseNodeMetaModel nodeMetaModel, ClassOrInterfaceDeclaration nodeCoid, PropertyMetaModel property) { final List<MethodDeclaration> setters = nodeCoid.getMethodsBySignature(property.getSetterMethodName(), property.getTypeNameForSetter()); - String name = property.getName(); + final String name = property.getName(); if (setters.size() != 1) { throw new AssertionError(f("Not exactly one setter exists: %s.%s = %s", nodeMetaModel.getTypeName(), name, setters.size())); } @@ -50,6 +48,13 @@ public class PropertyGenerator extends NodeGenerator { .addModifier(FINAL); // Fill body + final String observableName = camelCaseToScreaming(name.startsWith("is") ? name.substring(2) : name); + observablePropertyNames.add(observableName); + if (property == JavaParserMetaModel.nodeMetaModel.commentPropertyMetaModel) { + // Node.comment has a very specific setter that we shouldn't overwrite. + return; + } + final BlockStmt body = setter.getBody().get(); body.getStatements().clear(); if (property.isRequired()) { @@ -60,8 +65,6 @@ public class PropertyGenerator extends NodeGenerator { body.addStatement(f("assertNotNull(%s);", name)); } } - final String observableName = camelCaseToScreaming(name.startsWith("is") ? name.substring(2) : name); - observablePropertyNames.add(observableName); body.addStatement(f("notifyPropertyChange(ObservableProperty.%s, this.%s, %s);", observableName, name, name)); body.addStatement(f("this.%s = %s;", name, name)); if (property.isNode()) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java index a702f0d86..ed58caf8b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java @@ -26,7 +26,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithName; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java index ddcfcf6ce..8374d06b3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java @@ -197,9 +197,17 @@ public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable * @param comment to be set */ public final Node setComment(final Comment comment) { + if (comment != null && (this instanceof Comment)) { + throw new RuntimeException("A comment can not be commented"); + } notifyPropertyChange(ObservableProperty.COMMENT, this.comment, comment); + if (this.comment != null) { + this.comment.setCommentedNode(null); + } this.comment = comment; - setAsParentNodeOf(comment); + if (comment != null) { + this.comment.setCommentedNode(this); + } return this; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java index 9b89e7991..dc54fe4d4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java @@ -25,7 +25,6 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java index 7bc493de0..a24ca39c2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java @@ -25,7 +25,6 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java index aed8f3c0e..21e9554e7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java @@ -28,7 +28,6 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java index 33ac01e38..e6a719d6d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java @@ -25,7 +25,6 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java index 836d6e22a..c00c67d59 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java @@ -26,7 +26,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithExpression; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java index 6a3115631..6acc9fef1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java @@ -34,7 +34,6 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; import java.util.EnumSet; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java index 6d16d0f5d..62c41972e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java @@ -28,7 +28,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java index b983a7896..2b2d4b83e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java @@ -28,7 +28,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithExpression; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java index 883794e7c..ccf75ab7a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java @@ -28,7 +28,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java index 0ec8ad490..5c2941e76 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java @@ -31,7 +31,6 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import java.util.Arrays; import java.util.HashMap; import java.util.List; - import static com.github.javaparser.utils.Utils.assertNotNull; /** |