From cb46f5b57c9ff42aa74ee92043a95b6c987e3c87 Mon Sep 17 00:00:00 2001 From: Alexander Weigl Date: Fri, 15 Nov 2024 23:39:36 +0100 Subject: [PATCH] fix merge errors --- .../generator/VisitorGenerator.java | 2 +- .../core/node/PropertyGenerator.java | 4 +- .../metamodel/MetaModelGenerator.java | 87 +- .../metamodel/NodeMetaModelGenerator.java | 2 +- javaparser-core-serialization/pom.xml | 9 +- .../JavaParserJsonDeserializer.java | 3 +- .../JavaParserJsonSerializerTest.java | 8 +- .../javaparser/steps/ManipulationSteps.java | 2 +- .../body/ClassOrInterfaceDeclarationTest.java | 4 +- .../ast/body/RecordDeclarationTest.java | 8 +- .../ast/nodeTypes/NodeWithModifiersTest.java | 4 +- .../builders/CompilationUnitBuildersTest.java | 4 +- .../builders/NodeWithMembersBuildersTest.java | 2 +- .../NodeWithParametersBuildersTest.java | 2 +- .../DifferenceElementCalculatorTest.java | 2 +- .../lexicalpreservation/Issue3761Test.java | 2 +- .../LexicalDifferenceCalculatorTest.java | 2 +- .../LexicalPreservingPrinterTest.java | 2 +- .../TransformationsTest.java | 2 +- ...otationDeclarationTransformationsTest.java | 4 +- ...nMemberDeclarationTransformationsTest.java | 4 +- ...terfaceDeclarationTransformationsTest.java | 4 +- ...tructorDeclarationTransformationsTest.java | 4 +- .../EnumDeclarationTransformationsTest.java | 4 +- .../FieldDeclarationTransformationsTest.java | 4 +- .../MethodDeclarationTransformationsTest.java | 6 +- .../github/javaparser/CommentsInserter.java | 55 +- .../com/github/javaparser/HasParentNode.java | 5 +- .../com/github/javaparser/JavaParser.java | 105 +- .../github/javaparser/JavaParserAdapter.java | 64 +- .../java/com/github/javaparser/JavaToken.java | 1276 ++++-- .../com/github/javaparser/JavadocParser.java | 56 +- .../LineEndingProcessingProvider.java | 17 +- .../javaparser/ParseProblemException.java | 9 +- .../com/github/javaparser/ParseResult.java | 18 +- .../com/github/javaparser/ParseStart.java | 8 +- .../javaparser/ParserConfiguration.java | 163 +- .../java/com/github/javaparser/Position.java | 40 +- .../java/com/github/javaparser/Problem.java | 28 +- .../java/com/github/javaparser/Processor.java | 7 +- .../java/com/github/javaparser/Providers.java | 7 +- .../java/com/github/javaparser/Range.java | 48 +- .../github/javaparser/StaticJavaParser.java | 16 +- .../com/github/javaparser/TokenRange.java | 26 +- .../com/github/javaparser/TokenTypes.java | 11 +- .../UnicodeEscapeProcessingProvider.java | 165 +- .../javaparser/ast/AbstractModifier.java | 8 +- .../javaparser/ast/AccessSpecifier.java | 10 +- .../javaparser/ast/AllFieldsConstructor.java | 3 +- .../javaparser/ast/ArrayCreationLevel.java | 42 +- .../javaparser/ast/CompilationUnit.java | 232 +- .../com/github/javaparser/ast/DataKey.java | 4 +- .../com/github/javaparser/ast/Generated.java | 5 +- .../javaparser/ast/ImportDeclaration.java | 44 +- .../com/github/javaparser/ast/Jmlish.java | 2 +- .../com/github/javaparser/ast/Modifier.java | 31 +- .../java/com/github/javaparser/ast/Node.java | 267 +- .../com/github/javaparser/ast/NodeList.java | 153 +- .../javaparser/ast/PackageDeclaration.java | 38 +- .../ast/body/AnnotationDeclaration.java | 40 +- .../ast/body/AnnotationMemberDeclaration.java | 81 +- .../javaparser/ast/body/BodyDeclaration.java | 279 +- .../ast/body/CallableDeclaration.java | 135 +- .../ast/body/ClassAccessibleClause.java | 2 +- .../ast/body/ClassOrInterfaceDeclaration.java | 134 +- .../ast/body/ClassRepresentsClause.java | 2 +- .../body/CompactConstructorDeclaration.java | 123 +- .../ast/body/ConstructorDeclaration.java | 138 +- .../ast/body/EnumConstantDeclaration.java | 68 +- .../javaparser/ast/body/EnumDeclaration.java | 88 +- .../javaparser/ast/body/FieldDeclaration.java | 102 +- .../ast/body/InitializerDeclaration.java | 40 +- .../ast/body/MethodDeclaration.java | 209 +- .../github/javaparser/ast/body/Parameter.java | 97 +- .../ast/body/ReceiverParameter.java | 49 +- .../ast/body/RecordDeclaration.java | 134 +- .../javaparser/ast/body/TypeDeclaration.java | 89 +- .../ast/body/VariableDeclarator.java | 70 +- .../javaparser/ast/comments/BlockComment.java | 28 +- .../javaparser/ast/comments/Comment.java | 63 +- .../ast/comments/CommentsCollection.java | 48 +- .../ast/comments/JavadocComment.java | 32 +- .../javaparser/ast/comments/LineComment.java | 28 +- .../javaparser/ast/expr/AnnotationExpr.java | 33 +- .../javaparser/ast/expr/ArrayAccessExpr.java | 46 +- .../ast/expr/ArrayCreationExpr.java | 64 +- .../ast/expr/ArrayInitializerExpr.java | 36 +- .../javaparser/ast/expr/AssignExpr.java | 55 +- .../javaparser/ast/expr/BinaryExpr.java | 54 +- .../ast/expr/BooleanLiteralExpr.java | 30 +- .../github/javaparser/ast/expr/CastExpr.java | 42 +- .../javaparser/ast/expr/CharLiteralExpr.java | 30 +- .../github/javaparser/ast/expr/ClassExpr.java | 35 +- .../javaparser/ast/expr/ConditionalExpr.java | 51 +- .../ast/expr/DoubleLiteralExpr.java | 30 +- .../javaparser/ast/expr/EnclosedExpr.java | 37 +- .../javaparser/ast/expr/Expression.java | 603 ++- .../javaparser/ast/expr/FieldAccessExpr.java | 67 +- .../javaparser/ast/expr/InstanceOfExpr.java | 57 +- .../ast/expr/IntegerLiteralExpr.java | 34 +- .../javaparser/ast/expr/LambdaExpr.java | 72 +- .../javaparser/ast/expr/LiteralExpr.java | 16 +- .../ast/expr/LiteralStringValueExpr.java | 22 +- .../javaparser/ast/expr/LongLiteralExpr.java | 34 +- .../ast/expr/MarkerAnnotationExpr.java | 28 +- .../javaparser/ast/expr/MemberValuePair.java | 35 +- .../javaparser/ast/expr/MethodCallExpr.java | 100 +- .../ast/expr/MethodReferenceExpr.java | 56 +- .../com/github/javaparser/ast/expr/Name.java | 43 +- .../github/javaparser/ast/expr/NameExpr.java | 39 +- .../ast/expr/NormalAnnotationExpr.java | 41 +- .../javaparser/ast/expr/NullLiteralExpr.java | 22 +- .../ast/expr/ObjectCreationExpr.java | 95 +- .../javaparser/ast/expr/PatternExpr.java | 31 +- .../ast/expr/RecordPatternExpr.java | 47 +- .../javaparser/ast/expr/SimpleName.java | 23 +- .../ast/expr/SingleMemberAnnotationExpr.java | 35 +- .../ast/expr/StringLiteralExpr.java | 33 +- .../github/javaparser/ast/expr/SuperExpr.java | 39 +- .../javaparser/ast/expr/SwitchExpr.java | 46 +- .../ast/expr/TextBlockLiteralExpr.java | 46 +- .../github/javaparser/ast/expr/ThisExpr.java | 41 +- .../github/javaparser/ast/expr/TypeExpr.java | 35 +- .../javaparser/ast/expr/TypePatternExpr.java | 44 +- .../github/javaparser/ast/expr/UnaryExpr.java | 52 +- .../ast/expr/VariableDeclarationExpr.java | 85 +- .../ast/jml/ArbitraryNodeContainer.java | 14 +- .../ast/jml/DefaultJmlContainer.java | 14 +- .../github/javaparser/ast/jml/HasJmlTags.java | 2 +- .../javaparser/ast/jml/JmlContainer.java | 2 +- .../github/javaparser/ast/jml/JmlKeyword.java | 2 +- .../javaparser/ast/jml/JmlModelProgram.java | 24 +- .../javaparser/ast/jml/NodeWithContracts.java | 2 +- .../javaparser/ast/jml/NodeWithJmlTags.java | 2 +- .../body/JmlClassAccessibleDeclaration.java | 52 +- .../ast/jml/body/JmlClassExprDeclaration.java | 64 +- .../jml/body/JmlClassLevelDeclaration.java | 30 +- .../ast/jml/body/JmlFieldDeclaration.java | 36 +- .../ast/jml/body/JmlMethodDeclaration.java | 42 +- .../jml/body/JmlRepresentsDeclaration.java | 42 +- .../ast/jml/body/JmlSpecification.java | 2 +- .../ast/jml/clauses/BlockContractable.java | 2 +- .../ast/jml/clauses/ContractType.java | 4 +- .../ast/jml/clauses/JmlCallableClause.java | 34 +- .../javaparser/ast/jml/clauses/JmlClause.java | 94 +- .../ast/jml/clauses/JmlClauseIf.java | 38 +- .../ast/jml/clauses/JmlClauseKind.java | 4 +- .../ast/jml/clauses/JmlClauseLabel.java | 48 +- .../ast/jml/clauses/JmlContract.java | 62 +- .../ast/jml/clauses/JmlForallClause.java | 32 +- .../ast/jml/clauses/JmlMethodSignature.java | 30 +- .../ast/jml/clauses/JmlMultiExprClause.java | 44 +- .../ast/jml/clauses/JmlOldClause.java | 30 +- .../ast/jml/clauses/JmlSignalsClause.java | 36 +- .../ast/jml/clauses/JmlSignalsOnlyClause.java | 38 +- .../ast/jml/clauses/JmlSimpleExprClause.java | 52 +- .../ast/jml/clauses/LoopContractable.java | 2 +- .../ast/jml/clauses/MethodContractable.java | 2 +- .../github/javaparser/ast/jml/doc/JmlDoc.java | 18 +- .../ast/jml/doc/JmlDocContainer.java | 2 +- .../ast/jml/doc/JmlDocDeclaration.java | 37 +- .../ast/jml/doc/JmlDocModifier.java | 10 +- .../javaparser/ast/jml/doc/JmlDocStmt.java | 35 +- .../javaparser/ast/jml/doc/JmlDocType.java | 36 +- .../ast/jml/expr/JmlBinaryInfixExpr.java | 40 +- .../javaparser/ast/jml/expr/JmlLabelExpr.java | 56 +- .../javaparser/ast/jml/expr/JmlLetExpr.java | 34 +- .../ast/jml/expr/JmlMultiCompareExpr.java | 40 +- .../ast/jml/expr/JmlQuantifiedExpr.java | 58 +- .../ast/jml/expr/JmlSetComprehensionExpr.java | 47 +- .../javaparser/ast/jml/expr/JmlTypeExpr.java | 28 +- .../javaparser/ast/jml/stmt/JmlBeginStmt.java | 30 +- .../javaparser/ast/jml/stmt/JmlEndStmt.java | 30 +- .../ast/jml/stmt/JmlExpressionStmt.java | 62 +- .../javaparser/ast/jml/stmt/JmlGhostStmt.java | 46 +- .../javaparser/ast/jml/stmt/JmlLabelStmt.java | 34 +- .../ast/jml/stmt/JmlRefiningStmt.java | 30 +- .../javaparser/ast/jml/stmt/JmlStatement.java | 16 +- .../ast/jml/stmt/JmlUnreachableStmt.java | 38 +- .../javaparser/ast/jml/type/JmlLogicType.java | 26 +- .../ast/modules/ModuleDeclaration.java | 59 +- .../ast/modules/ModuleDirective.java | 118 +- .../ast/modules/ModuleExportsDirective.java | 53 +- .../ast/modules/ModuleOpensDirective.java | 51 +- .../ast/modules/ModuleProvidesDirective.java | 51 +- .../ast/modules/ModuleRequiresDirective.java | 62 +- .../ast/modules/ModuleUsesDirective.java | 47 +- .../ast/nodeTypes/NodeWithAnnotations.java | 13 +- .../ast/nodeTypes/NodeWithArguments.java | 6 +- .../ast/nodeTypes/NodeWithBlockStmt.java | 2 +- .../ast/nodeTypes/NodeWithBody.java | 2 +- .../ast/nodeTypes/NodeWithCondition.java | 2 +- .../ast/nodeTypes/NodeWithDeclaration.java | 2 +- .../ast/nodeTypes/NodeWithExpression.java | 3 +- .../ast/nodeTypes/NodeWithExtends.java | 3 +- .../ast/nodeTypes/NodeWithIdentifier.java | 3 +- .../ast/nodeTypes/NodeWithImplements.java | 3 +- .../ast/nodeTypes/NodeWithJavadoc.java | 5 +- .../ast/nodeTypes/NodeWithMembers.java | 90 +- .../ast/nodeTypes/NodeWithModifiers.java | 26 +- .../ast/nodeTypes/NodeWithName.java | 3 +- .../nodeTypes/NodeWithOptionalBlockStmt.java | 2 +- .../ast/nodeTypes/NodeWithOptionalLabel.java | 3 +- .../ast/nodeTypes/NodeWithOptionalScope.java | 2 +- .../ast/nodeTypes/NodeWithParameters.java | 34 +- .../ast/nodeTypes/NodeWithRange.java | 2 +- .../ast/nodeTypes/NodeWithScope.java | 2 +- .../ast/nodeTypes/NodeWithSimpleName.java | 3 +- .../ast/nodeTypes/NodeWithStatements.java | 3 +- .../nodeTypes/NodeWithThrownExceptions.java | 3 +- .../ast/nodeTypes/NodeWithTokenRange.java | 2 +- .../nodeTypes/NodeWithTraversableScope.java | 2 +- .../ast/nodeTypes/NodeWithType.java | 3 +- .../ast/nodeTypes/NodeWithTypeArguments.java | 3 +- .../ast/nodeTypes/NodeWithTypeParameters.java | 3 +- .../ast/nodeTypes/NodeWithVariables.java | 16 +- .../javaparser/ast/nodeTypes/SwitchNode.java | 2 +- .../modifiers/NodeWithAbstractModifier.java | 5 +- .../modifiers/NodeWithAccessModifiers.java | 4 +- .../modifiers/NodeWithFinalModifier.java | 5 +- .../modifiers/NodeWithPrivateModifier.java | 5 +- .../modifiers/NodeWithProtectedModifier.java | 5 +- .../modifiers/NodeWithPublicModifier.java | 5 +- .../modifiers/NodeWithStaticModifier.java | 5 +- .../modifiers/NodeWithStrictfpModifier.java | 5 +- .../javaparser/ast/observer/AstObserver.java | 6 +- .../ast/observer/AstObserverAdapter.java | 8 +- .../javaparser/ast/observer/Observable.java | 2 +- .../ast/observer/ObservableProperty.java | 88 +- .../ast/observer/PropagatingAstObserver.java | 19 +- .../javaparser/ast/stmt/AssertStmt.java | 48 +- .../github/javaparser/ast/stmt/Behavior.java | 4 +- .../github/javaparser/ast/stmt/BlockStmt.java | 47 +- .../github/javaparser/ast/stmt/BreakStmt.java | 39 +- .../javaparser/ast/stmt/CatchClause.java | 45 +- .../javaparser/ast/stmt/ContinueStmt.java | 39 +- .../github/javaparser/ast/stmt/DoStmt.java | 55 +- .../github/javaparser/ast/stmt/EmptyStmt.java | 22 +- .../ExplicitConstructorInvocationStmt.java | 74 +- .../javaparser/ast/stmt/ExpressionStmt.java | 35 +- .../javaparser/ast/stmt/ForEachStmt.java | 75 +- .../github/javaparser/ast/stmt/ForStmt.java | 79 +- .../github/javaparser/ast/stmt/IfStmt.java | 61 +- .../javaparser/ast/stmt/LabeledStmt.java | 44 +- .../ast/stmt/LocalClassDeclarationStmt.java | 35 +- .../ast/stmt/LocalRecordDeclarationStmt.java | 35 +- .../javaparser/ast/stmt/ReturnStmt.java | 39 +- .../github/javaparser/ast/stmt/Statement.java | 401 +- .../javaparser/ast/stmt/SwitchEntry.java | 90 +- .../javaparser/ast/stmt/SwitchStmt.java | 46 +- .../javaparser/ast/stmt/SynchronizedStmt.java | 43 +- .../github/javaparser/ast/stmt/ThrowStmt.java | 35 +- .../github/javaparser/ast/stmt/TryStmt.java | 71 +- .../javaparser/ast/stmt/UnparsableStmt.java | 26 +- .../github/javaparser/ast/stmt/WhileStmt.java | 55 +- .../github/javaparser/ast/stmt/YieldStmt.java | 35 +- .../github/javaparser/ast/type/ArrayType.java | 85 +- .../ast/type/ClassOrInterfaceType.java | 98 +- .../ast/type/ConvertibleToUsage.java | 2 +- .../javaparser/ast/type/IntersectionType.java | 43 +- .../javaparser/ast/type/PrimitiveType.java | 54 +- .../javaparser/ast/type/ReferenceType.java | 18 +- .../com/github/javaparser/ast/type/Type.java | 162 +- .../javaparser/ast/type/TypeParameter.java | 68 +- .../github/javaparser/ast/type/UnionType.java | 48 +- .../javaparser/ast/type/UnknownType.java | 32 +- .../github/javaparser/ast/type/VarType.java | 41 +- .../github/javaparser/ast/type/VoidType.java | 32 +- .../javaparser/ast/type/WildcardType.java | 65 +- .../ast/validator/ProblemReporter.java | 11 +- .../RecordAsTypeIdentifierNotAllowed.java | 8 +- .../validator/ReservedKeywordValidator.java | 9 +- .../ast/validator/SimpleValidator.java | 4 +- .../validator/SingleNodeTypeValidator.java | 6 +- .../ast/validator/TreeVisitorValidator.java | 4 +- .../ast/validator/TypedValidator.java | 8 +- .../javaparser/ast/validator/Validator.java | 2 +- .../javaparser/ast/validator/Validators.java | 14 +- .../ast/validator/VisitorValidator.java | 2 +- .../Java10PreviewValidator.java | 4 +- .../Java10Validator.java | 7 +- .../Java11PreviewValidator.java | 4 +- .../Java11Validator.java | 4 +- .../Java12PreviewValidator.java | 4 +- .../Java12Validator.java | 4 +- .../Java13PreviewValidator.java | 4 +- .../Java13Validator.java | 4 +- .../Java14PreviewValidator.java | 4 +- .../Java14Validator.java | 7 +- .../Java15PreviewValidator.java | 4 +- .../Java15Validator.java | 4 +- .../Java16PreviewValidator.java | 4 +- .../Java16Validator.java | 4 +- .../Java17PreviewValidator.java | 4 +- .../Java17Validator.java | 22 +- .../Java18Validator.java | 4 +- .../Java19Validator.java | 4 +- .../Java1_0Validator.java | 206 +- .../Java1_1Validator.java | 18 +- .../Java1_2Validator.java | 11 +- .../Java1_3Validator.java | 4 +- .../Java1_4Validator.java | 4 +- .../Java20Validator.java | 4 +- .../Java21Validator.java | 4 +- .../Java5Validator.java | 14 +- .../Java6Validator.java | 4 +- .../Java7Validator.java | 40 +- .../Java8Validator.java | 23 +- .../Java9Validator.java | 17 +- .../UpgradeJavaMessage.java | 6 +- .../chunks/CommonValidators.java | 78 +- .../chunks/ModifierValidator.java | 66 +- .../NoBinaryIntegerLiteralsValidator.java | 6 +- ...UnderscoresInIntegerLiteralsValidator.java | 6 +- .../chunks/RecordDeclarationValidator.java | 25 +- .../chunks/UnderscoreKeywordValidator.java | 6 +- .../chunks/VarValidator.java | 16 +- .../postprocessors/Java10PostProcessor.java | 10 +- .../postprocessors/Java11PostProcessor.java | 3 +- .../postprocessors/Java12PostProcessor.java | 3 +- .../postprocessors/Java13PostProcessor.java | 3 +- .../postprocessors/Java14PostProcessor.java | 3 +- .../postprocessors/Java15PostProcessor.java | 3 +- .../postprocessors/Java16PostProcessor.java | 3 +- .../postprocessors/Java17PostProcessor.java | 3 +- .../postprocessors/Java18PostProcessor.java | 3 +- .../postprocessors/Java19PostProcessor.java | 3 +- .../postprocessors/Java20PostProcessor.java | 3 +- .../postprocessors/Java21PostProcessor.java | 3 +- .../postprocessors/PostProcessors.java | 14 +- .../javaparser/ast/visitor/CloneVisitor.java | 389 +- .../javaparser/ast/visitor/EqualsVisitor.java | 1319 +++--- .../visitor/GenericListVisitorAdapter.java | 1230 +++--- .../ast/visitor/GenericVisitor.java | 10 +- .../ast/visitor/GenericVisitorAdapter.java | 1224 ++++-- .../visitor/GenericVisitorWithDefaults.java | 279 +- .../ast/visitor/HashCodeVisitor.java | 736 ++-- .../ast/visitor/ModifierVisitor.java | 578 +-- .../ast/visitor/NoCommentEqualsVisitor.java | 1010 +++-- .../ast/visitor/NoCommentHashCodeVisitor.java | 527 +-- .../ast/visitor/NodeFinderVisitor.java | 1197 ++++-- .../visitor/ObjectIdentityEqualsVisitor.java | 277 +- .../ObjectIdentityHashCodeVisitor.java | 278 +- .../javaparser/ast/visitor/TreeVisitor.java | 10 +- .../javaparser/ast/visitor/Visitable.java | 2 +- .../javaparser/ast/visitor/VoidVisitor.java | 11 +- .../ast/visitor/VoidVisitorAdapter.java | 275 +- .../ast/visitor/VoidVisitorWithDefaults.java | 282 +- .../github/javaparser/javadoc/Javadoc.java | 37 +- .../javaparser/javadoc/JavadocBlockTag.java | 38 +- .../description/JavadocDescription.java | 26 +- .../JavadocDescriptionElement.java | 2 +- .../javadoc/description/JavadocInlineTag.java | 36 +- .../javadoc/description/JavadocSnippet.java | 18 +- .../com/github/javaparser/jml/Example.java | 2 +- .../javaparser/jml/JmlDocHardRemover.java | 12 +- .../javaparser/jml/JmlDocSanitizer.java | 14 +- .../github/javaparser/jml/JmlProcessor.java | 12 +- .../com/github/javaparser/jml/JmlUtility.java | 18 +- .../javaparser/jml/JmlWarnRemaingJmlDoc.java | 16 +- .../javaparser/jml/StringConstructor.java | 10 +- .../jml/impl/JmlAnnotationConfiguration.java | 4 +- .../jml/impl/JmlAnnotationSupport.java | 10 +- .../AnnotationDeclarationMetaModel.java | 14 +- .../metamodel/AnnotationExprMetaModel.java | 24 +- .../AnnotationMemberDeclarationMetaModel.java | 22 +- .../metamodel/ArrayAccessExprMetaModel.java | 18 +- .../metamodel/ArrayCreationExprMetaModel.java | 20 +- .../ArrayCreationLevelMetaModel.java | 16 +- .../ArrayInitializerExprMetaModel.java | 16 +- .../metamodel/ArrayTypeMetaModel.java | 10 +- .../metamodel/AssertStmtMetaModel.java | 10 +- .../metamodel/AssignExprMetaModel.java | 12 +- .../metamodel/BaseNodeMetaModel.java | 58 +- .../metamodel/BinaryExprMetaModel.java | 12 +- .../metamodel/BlockCommentMetaModel.java | 14 +- .../metamodel/BlockStmtMetaModel.java | 10 +- .../metamodel/BodyDeclarationMetaModel.java | 24 +- .../BooleanLiteralExprMetaModel.java | 16 +- .../metamodel/BreakStmtMetaModel.java | 8 +- .../metamodel/BreaksClauseMetaModel.java | 6 +- .../metamodel/CallableClauseMetaModel.java | 2 +- .../CallableDeclarationMetaModel.java | 36 +- .../metamodel/CallableMetaModel.java | 2 +- .../metamodel/CastExprMetaModel.java | 10 +- .../metamodel/CatchClauseMetaModel.java | 10 +- .../metamodel/CharLiteralExprMetaModel.java | 14 +- .../metamodel/ClassExprMetaModel.java | 8 +- .../ClassInvariantClauseMetaModel.java | 6 +- .../ClassOrInterfaceDeclarationMetaModel.java | 24 +- .../ClassOrInterfaceTypeMetaModel.java | 22 +- .../metamodel/CommentMetaModel.java | 16 +- ...ompactConstructorDeclarationMetaModel.java | 24 +- .../metamodel/CompilationUnitMetaModel.java | 20 +- .../metamodel/ConditionalExprMetaModel.java | 20 +- .../ConstructorDeclarationMetaModel.java | 16 +- .../metamodel/ContinueStmtMetaModel.java | 16 +- .../javaparser/metamodel/DerivedProperty.java | 4 +- .../javaparser/metamodel/DoStmtMetaModel.java | 12 +- .../metamodel/DoubleLiteralExprMetaModel.java | 14 +- .../metamodel/EmptyStmtMetaModel.java | 6 +- .../metamodel/EnclosedExprMetaModel.java | 16 +- .../EnumConstantDeclarationMetaModel.java | 20 +- .../metamodel/EnumDeclarationMetaModel.java | 18 +- ...citConstructorInvocationStmtMetaModel.java | 24 +- .../metamodel/ExpressionMetaModel.java | 14 +- .../metamodel/ExpressionStmtMetaModel.java | 16 +- .../metamodel/FieldAccessExprMetaModel.java | 22 +- .../metamodel/FieldDeclarationMetaModel.java | 20 +- .../metamodel/ForEachStmtMetaModel.java | 14 +- .../metamodel/ForStmtMetaModel.java | 16 +- .../metamodel/ForallClauseMetaModel.java | 4 +- .../javaparser/metamodel/IfStmtMetaModel.java | 20 +- .../metamodel/ImportDeclarationMetaModel.java | 22 +- .../InitializerDeclarationMetaModel.java | 18 +- .../metamodel/InstanceOfExprMetaModel.java | 20 +- .../IntegerLiteralExprMetaModel.java | 14 +- .../metamodel/InternalProperty.java | 4 +- .../metamodel/IntersectionTypeMetaModel.java | 16 +- .../metamodel/JavaParserMetaModel.java | 3653 +++++------------ .../metamodel/JavadocCommentMetaModel.java | 14 +- .../metamodel/JmlAssertStmtMetaModel.java | 4 +- .../metamodel/JmlBeginStmtMetaModel.java | 4 +- .../JmlBinaryInfixExprMetaModel.java | 8 +- .../metamodel/JmlBindingExprMetaModel.java | 8 +- .../metamodel/JmlCallableClauseMetaModel.java | 4 +- ...mlClassAccessibleDeclarationMetaModel.java | 12 +- .../JmlClassExprDeclarationMetaModel.java | 12 +- ...JmlClassInvariantDeclarationMetaModel.java | 6 +- .../JmlClassLevelDeclarationMetaModel.java | 3 +- .../metamodel/JmlClassLevelMetaModel.java | 2 +- .../metamodel/JmlClauseIfMetaModel.java | 8 +- .../metamodel/JmlClauseLEMetaModel.java | 6 +- .../metamodel/JmlClauseLabelMetaModel.java | 8 +- .../metamodel/JmlClauseMetaModel.java | 4 +- .../metamodel/JmlContractMetaModel.java | 16 +- .../metamodel/JmlDefaultClauseMetaModel.java | 8 +- .../metamodel/JmlDocDeclarationMetaModel.java | 4 +- .../javaparser/metamodel/JmlDocMetaModel.java | 4 +- .../metamodel/JmlDocModifierMetaModel.java | 4 +- .../metamodel/JmlDocStmtMetaModel.java | 4 +- .../metamodel/JmlDocTypeMetaModel.java | 4 +- .../metamodel/JmlEndStmtMetaModel.java | 4 +- .../metamodel/JmlExpressionStmtMetaModel.java | 8 +- .../JmlFieldDeclarationMetaModel.java | 6 +- .../metamodel/JmlForallClauseMetaModel.java | 4 +- .../metamodel/JmlGhostStatementMetaModel.java | 4 +- .../JmlGhostStatementsMetaModel.java | 4 +- .../metamodel/JmlGhostStmtMetaModel.java | 6 +- .../metamodel/JmlLabelExprMetaModel.java | 8 +- .../metamodel/JmlLabelMetaModel.java | 8 +- .../metamodel/JmlLabelStmtMetaModel.java | 6 +- .../metamodel/JmlLetExprMetaModel.java | 6 +- .../JmlMethodDeclarationMetaModel.java | 8 +- .../JmlMethodSignatureMetaModel.java | 8 +- .../JmlMultiCompareExprMetaModel.java | 6 +- .../JmlMultiExprClauseMetaModel.java | 8 +- .../metamodel/JmlOldClauseMetaModel.java | 4 +- .../metamodel/JmlQuantifiedExprMetaModel.java | 8 +- .../metamodel/JmlRefiningStmtMetaModel.java | 4 +- .../JmlRepresentsDeclarationMetaModel.java | 10 +- .../JmlSetComprehensionExprMetaModel.java | 7 +- .../JmlSetComprehensionMetaModel.java | 6 +- .../metamodel/JmlSignalsClauseMetaModel.java | 6 +- .../JmlSignalsOnlyClauseMetaModel.java | 4 +- .../JmlSimpleExprClauseMetaModel.java | 8 +- .../metamodel/JmlStatementMetaModel.java | 2 +- .../JmlStmtWithExpressionMetaModel.java | 6 +- .../metamodel/JmlTypeExprMetaModel.java | 4 +- .../JmlUnreachableStmtMetaModel.java | 4 +- .../metamodel/LabeledStmtMetaModel.java | 10 +- .../metamodel/LambdaExprMetaModel.java | 16 +- .../metamodel/LineCommentMetaModel.java | 14 +- .../metamodel/LiteralExprMetaModel.java | 14 +- .../LiteralStringValueExprMetaModel.java | 24 +- .../LocalClassDeclarationStmtMetaModel.java | 16 +- .../LocalRecordDeclarationStmtMetaModel.java | 16 +- .../metamodel/LongLiteralExprMetaModel.java | 14 +- .../MarkerAnnotationExprMetaModel.java | 14 +- .../metamodel/MemberValuePairMetaModel.java | 18 +- .../metamodel/MethodCallExprMetaModel.java | 24 +- .../metamodel/MethodDeclarationMetaModel.java | 18 +- .../MethodReferenceExprMetaModel.java | 22 +- .../metamodel/ModifierMetaModel.java | 8 +- .../metamodel/ModuleDeclarationMetaModel.java | 22 +- .../metamodel/ModuleDirectiveMetaModel.java | 22 +- .../ModuleExportsDirectiveMetaModel.java | 18 +- .../ModuleOpensDirectiveMetaModel.java | 18 +- .../ModuleProvidesDirectiveMetaModel.java | 18 +- .../ModuleRequiresDirectiveMetaModel.java | 18 +- .../ModuleUsesDirectiveMetaModel.java | 16 +- .../metamodel/NameExprMetaModel.java | 8 +- .../javaparser/metamodel/NameMetaModel.java | 10 +- .../javaparser/metamodel/NodeMetaModel.java | 16 +- .../metamodel/NonEmptyProperty.java | 6 +- .../NormalAnnotationExprMetaModel.java | 16 +- .../metamodel/NullLiteralExprMetaModel.java | 14 +- .../ObjectCreationExprMetaModel.java | 26 +- .../metamodel/OptionalProperty.java | 4 +- .../PackageDeclarationMetaModel.java | 18 +- .../metamodel/ParameterMetaModel.java | 18 +- .../metamodel/PatternExprMetaModel.java | 16 +- .../metamodel/PrimitiveTypeMetaModel.java | 16 +- .../metamodel/PropertyMetaModel.java | 75 +- .../metamodel/ReceiverParameterMetaModel.java | 20 +- .../metamodel/RecordDeclarationMetaModel.java | 22 +- .../metamodel/RecordPatternExprMetaModel.java | 18 +- .../metamodel/ReferenceTypeMetaModel.java | 22 +- .../metamodel/ReturnStmtMetaModel.java | 8 +- .../metamodel/SignalsClauseMetaModel.java | 8 +- .../metamodel/SignalsMetaModel.java | 2 +- .../metamodel/SignalsOnlyClauseMetaModel.java | 4 +- .../metamodel/SignalsOnlyMetaModel.java | 2 +- .../metamodel/SimpleNameMetaModel.java | 8 +- .../SingleMemberAnnotationExprMetaModel.java | 16 +- .../metamodel/StatementMetaModel.java | 14 +- .../metamodel/StringLiteralExprMetaModel.java | 14 +- .../metamodel/SuperExprMetaModel.java | 8 +- .../metamodel/SwitchEntryMetaModel.java | 18 +- .../metamodel/SwitchExprMetaModel.java | 10 +- .../metamodel/SwitchStmtMetaModel.java | 10 +- .../metamodel/SynchronizedStmtMetaModel.java | 18 +- .../TextBlockLiteralExprMetaModel.java | 14 +- .../metamodel/ThisExprMetaModel.java | 8 +- .../metamodel/ThrowStmtMetaModel.java | 8 +- .../metamodel/TryStmtMetaModel.java | 14 +- .../metamodel/TypeDeclarationMetaModel.java | 28 +- .../metamodel/TypeExprMetaModel.java | 8 +- .../javaparser/metamodel/TypeMetaModel.java | 16 +- .../metamodel/TypeParameterMetaModel.java | 18 +- .../metamodel/TypePatternExprMetaModel.java | 18 +- .../metamodel/UnaryExprMetaModel.java | 14 +- .../metamodel/UnionTypeMetaModel.java | 8 +- .../metamodel/UnknownTypeMetaModel.java | 6 +- .../metamodel/UnparsableStmtMetaModel.java | 14 +- .../metamodel/UnreachableStmtMetaModel.java | 2 +- .../metamodel/VarTypeMetaModel.java | 6 +- .../VariableDeclarationExprMetaModel.java | 22 +- .../VariableDeclaratorMetaModel.java | 20 +- .../metamodel/VoidTypeMetaModel.java | 6 +- .../metamodel/WhileStmtMetaModel.java | 12 +- .../metamodel/WildcardTypeMetaModel.java | 18 +- .../WorkingSpaceClauseMetaModel.java | 2 +- .../metamodel/YieldStmtMetaModel.java | 8 +- .../printer/ConcreteSyntaxModel.java | 1215 +----- .../printer/DefaultPrettyPrinter.java | 15 +- .../printer/DefaultPrettyPrinterVisitor.java | 458 +-- .../github/javaparser/printer/DotPrinter.java | 41 +- .../printer/PrettyPrintVisitor.java | 434 +- .../javaparser/printer/PrettyPrinter.java | 21 +- .../github/javaparser/printer/Printer.java | 2 +- .../javaparser/printer/SourcePrinter.java | 52 +- .../github/javaparser/printer/Stringable.java | 2 +- .../github/javaparser/printer/XmlPrinter.java | 28 +- .../javaparser/printer/YamlPrinter.java | 43 +- .../concretesyntaxmodel/CsmAttribute.java | 52 +- .../printer/concretesyntaxmodel/CsmChar.java | 10 +- .../concretesyntaxmodel/CsmComment.java | 4 +- .../concretesyntaxmodel/CsmConditional.java | 40 +- .../concretesyntaxmodel/CsmElement.java | 35 +- .../concretesyntaxmodel/CsmIndent.java | 10 +- .../printer/concretesyntaxmodel/CsmList.java | 27 +- .../printer/concretesyntaxmodel/CsmMix.java | 20 +- .../printer/concretesyntaxmodel/CsmNone.java | 5 +- .../CsmOrphanCommentsEnding.java | 5 +- .../concretesyntaxmodel/CsmSequence.java | 10 +- .../CsmSingleReference.java | 10 +- .../concretesyntaxmodel/CsmString.java | 10 +- .../concretesyntaxmodel/CsmTextBlock.java | 10 +- .../printer/concretesyntaxmodel/CsmToken.java | 43 +- .../concretesyntaxmodel/CsmUnindent.java | 8 +- .../configuration/ConfigurationOption.java | 2 +- .../DefaultConfigurationOption.java | 34 +- .../DefaultPrinterConfiguration.java | 33 +- .../configuration/ImportOrderingStrategy.java | 2 +- .../printer/configuration/Indentation.java | 24 +- .../PrettyPrinterConfiguration.java | 152 +- .../configuration/PrinterConfiguration.java | 2 +- .../DefaultImportOrderingStrategy.java | 10 +- .../EclipseImportOrderingStrategy.java | 8 +- .../IntelliJImportOrderingStrategy.java | 8 +- .../printer/lexicalpreservation/Added.java | 35 +- .../lexicalpreservation/ChildTextElement.java | 44 +- .../lexicalpreservation/Difference.java | 253 +- .../DifferenceElement.java | 2 +- .../DifferenceElementCalculator.java | 79 +- .../printer/lexicalpreservation/Kept.java | 38 +- .../LexicalDifferenceCalculator.java | 237 +- .../LexicalPreservingPrinter.java | 196 +- .../LexicalPreservingVisitor.java | 12 +- .../LookaheadIterator.java | 6 +- .../printer/lexicalpreservation/NodeText.java | 7 +- .../lexicalpreservation/PeekingIterator.java | 35 +- .../lexicalpreservation/PhantomNodeLogic.java | 19 +- .../PrintableTextElement.java | 2 +- .../printer/lexicalpreservation/Removed.java | 39 +- .../lexicalpreservation/RemovedGroup.java | 39 +- .../lexicalpreservation/Reshuffled.java | 35 +- .../ReshuffledDiffElementExtractor.java | 73 +- .../lexicalpreservation/TextElement.java | 16 +- .../TextElementIteratorsFactory.java | 27 +- .../TextElementMatcher.java | 2 +- .../TextElementMatchers.java | 4 +- .../lexicalpreservation/TokenTextElement.java | 44 +- .../lexicalpreservation/changes/Change.java | 13 +- .../changes/ListAdditionChange.java | 11 +- .../changes/ListRemovalChange.java | 20 +- .../changes/ListReplacementChange.java | 11 +- .../lexicalpreservation/changes/NoChange.java | 6 +- .../changes/PropertyChange.java | 12 +- .../github/javaparser/quality/NotNull.java | 3 +- .../github/javaparser/quality/Nullable.java | 3 +- .../github/javaparser/resolution/Context.java | 33 +- .../resolution/MethodAmbiguityException.java | 4 +- .../javaparser/resolution/MethodUsage.java | 76 +- .../javaparser/resolution/Navigator.java | 20 +- .../javaparser/resolution/Resolvable.java | 2 +- .../github/javaparser/resolution/Solver.java | 5 +- .../resolution/SymbolDeclarator.java | 2 +- .../javaparser/resolution/SymbolResolver.java | 2 +- .../javaparser/resolution/TypeSolver.java | 2 +- .../resolution/UnsolvedSymbolException.java | 17 +- .../javaparser/resolution/cache/Cache.java | 2 +- .../resolution/cache/CacheStats.java | 2 +- .../declarations/AssociableToAST.java | 2 +- .../declarations/HasAccessSpecifier.java | 2 +- .../ResolvedAnnotationDeclaration.java | 2 +- .../ResolvedAnnotationMemberDeclaration.java | 2 +- .../ResolvedClassDeclaration.java | 3 +- .../ResolvedConstructorDeclaration.java | 2 +- .../declarations/ResolvedDeclaration.java | 2 +- .../ResolvedEnumConstantDeclaration.java | 2 +- .../declarations/ResolvedEnumDeclaration.java | 7 +- .../ResolvedFieldDeclaration.java | 2 +- .../ResolvedInterfaceDeclaration.java | 3 +- .../ResolvedMethodDeclaration.java | 2 +- .../ResolvedMethodLikeDeclaration.java | 6 +- .../ResolvedParameterDeclaration.java | 2 +- .../ResolvedRecordDeclaration.java | 3 +- .../ResolvedReferenceTypeDeclaration.java | 62 +- .../declarations/ResolvedTypeDeclaration.java | 9 +- .../ResolvedTypeParameterDeclaration.java | 45 +- .../ResolvedTypeParametrizable.java | 2 +- .../ResolvedTypePatternDeclaration.java | 2 +- .../ResolvedValueDeclaration.java | 2 +- .../ConflictingGenericTypesException.java | 4 +- .../logic/ConstructorResolutionLogic.java | 71 +- .../logic/FunctionalInterfaceLogic.java | 36 +- .../resolution/logic/InferenceContext.java | 70 +- .../logic/InferenceVariableType.java | 51 +- .../logic/MethodResolutionCapability.java | 5 +- .../logic/MethodResolutionLogic.java | 292 +- .../model/LambdaArgumentTypePlaceholder.java | 16 +- .../resolution/model/SymbolReference.java | 17 +- .../javaparser/resolution/model/Value.java | 10 +- .../resolution/model/typesystem/LazyType.java | 47 +- .../resolution/model/typesystem/NullType.java | 17 +- .../model/typesystem/ReferenceTypeImpl.java | 72 +- .../promotion/ConditionalExprHandler.java | 2 +- .../resolution/types/ResolvedArrayType.java | 43 +- .../types/ResolvedIntersectionType.java | 32 +- .../types/ResolvedLambdaConstraintType.java | 14 +- .../types/ResolvedPrimitiveType.java | 56 +- .../types/ResolvedReferenceType.java | 215 +- .../resolution/types/ResolvedType.java | 10 +- .../types/ResolvedTypeTransformer.java | 2 +- .../types/ResolvedTypeVariable.java | 67 +- .../resolution/types/ResolvedUnionType.java | 42 +- .../resolution/types/ResolvedVoidType.java | 13 +- .../resolution/types/ResolvedWildcard.java | 57 +- .../ResolvedTypeParameterValueProvider.java | 13 +- .../ResolvedTypeParametersMap.java | 44 +- .../ResolvedTypeParametrized.java | 2 +- .../github/javaparser/utils/ClassUtils.java | 2 +- .../javaparser/utils/CodeGenerationUtils.java | 7 +- .../javaparser/utils/CollectionStrategy.java | 12 +- .../javaparser/utils/LineSeparator.java | 19 +- .../java/com/github/javaparser/utils/Log.java | 22 +- .../com/github/javaparser/utils/Pair.java | 23 +- .../utils/ParserCollectionStrategy.java | 17 +- .../javaparser/utils/PositionUtils.java | 27 +- .../github/javaparser/utils/ProjectRoot.java | 16 +- .../utils/SeparatedItemStringBuilder.java | 10 +- .../github/javaparser/utils/SourceRoot.java | 110 +- .../github/javaparser/utils/SourceZip.java | 22 +- .../javaparser/utils/StringEscapeUtils.java | 29 +- .../github/javaparser/utils/TypeUtils.java | 7 +- .../com/github/javaparser/utils/Utils.java | 17 +- .../github/javaparser/utils/VisitorList.java | 114 +- .../github/javaparser/utils/VisitorMap.java | 38 +- .../github/javaparser/utils/VisitorSet.java | 66 +- javaparser-core/src/main/javacc/java.jj | 74 +- .../symbolsolver/JavaSymbolSolver.java | 1 + .../logic/AbstractClassDeclarationTest.java | 2 +- .../logic/AbstractTypeDeclarationTest.java | 2 +- .../genetics/AbstractListChromosome.java | 2 +- .../geometry/partitioning/AbstractRegion.java | 2 +- .../partitioning/AbstractSubHyperplane.java | 2 +- .../AbstractFieldStepInterpolator.java | 2 +- 699 files changed, 16117 insertions(+), 19506 deletions(-) diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java index 7d44f6f75d..957394ee03 100644 --- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java +++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java @@ -21,7 +21,7 @@ package com.github.javaparser.generator; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; 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 a2d1d9a4cd..9e31062f7b 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 @@ -22,8 +22,8 @@ package com.github.javaparser.generator.core.node; import static com.github.javaparser.StaticJavaParser.parseType; -import static com.github.javaparser.ast.Modifier.Keyword.FINAL; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.FINAL; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.camelCaseToScreaming; diff --git a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java index 27b16ee133..ec3a7176cf 100644 --- a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java +++ b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java @@ -25,6 +25,11 @@ import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.doc.*; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.CompactConstructorDeclaration; @@ -151,18 +156,18 @@ public class MetaModelGenerator extends AbstractGenerator { add(com.github.javaparser.ast.expr.UnaryExpr.class); add(com.github.javaparser.ast.expr.VariableDeclarationExpr.class); - add(JmlDoc.class); - add(JmlDocDeclaration.class); - add(JmlDocStmt.class); - add(JmlDocType.class); + add(JmlDoc.class); + add(JmlDocDeclaration.class); + add(JmlDocStmt.class); + add(JmlDocType.class); - add(JmlQuantifiedExpr.class); - add(JmlTypeExpr.class); - add(JmlBinaryInfixExpr.class); - add(JmlLetExpr.class); - add(JmlMultiCompareExpr.class); - add(JmlLabelExpr.class); - add(JmlSetComprehensionExpr.class); + add(JmlQuantifiedExpr.class); + add(JmlTypeExpr.class); + add(JmlBinaryInfixExpr.class); + add(JmlLetExpr.class); + add(JmlMultiCompareExpr.class); + add(JmlLabelExpr.class); + add(JmlSetComprehensionExpr.class); add(com.github.javaparser.ast.stmt.AssertStmt.class); add(com.github.javaparser.ast.stmt.BlockStmt.class); @@ -189,36 +194,36 @@ public class MetaModelGenerator extends AbstractGenerator { add(com.github.javaparser.ast.stmt.WhileStmt.class); add(com.github.javaparser.ast.stmt.YieldStmt.class); - add(JmlStatement.class); - add(JmlGhostStmt.class); - add(JmlExpressionStmt.class); - add(JmlRefiningStmt.class); - add(JmlUnreachableStmt.class); - add(JmlLabelStmt.class); - add(JmlBeginStmt.class); - add(JmlEndStmt.class); - - add(JmlClassLevelDeclaration.class); - add(JmlMethodDeclaration.class); - add(JmlFieldDeclaration.class); - add(JmlClause.class); - add(JmlSimpleExprClause.class); - add(JmlMultiExprClause.class); - add(JmlSignalsClause.class); - add(JmlSignalsOnlyClause.class); - add(JmlClauseLabel.class); - add(JmlForallClause.class); - add(JmlOldClause.class); - add(JmlCallableClause.class); - add(JmlClauseIf.class); - add(JmlMethodSignature.class); - add(com.github.javaparser.ast.jml.clauses.JmlContract.class); - - //add(com.github.javaparser.ast.JmlBoundVariable.class); - - add(JmlClassExprDeclaration.class); - add(JmlRepresentsDeclaration.class); - add(JmlClassAccessibleDeclaration.class); + add(JmlStatement.class); + add(JmlGhostStmt.class); + add(JmlExpressionStmt.class); + add(JmlRefiningStmt.class); + add(JmlUnreachableStmt.class); + add(JmlLabelStmt.class); + add(JmlBeginStmt.class); + add(JmlEndStmt.class); + + add(JmlClassLevelDeclaration.class); + add(JmlMethodDeclaration.class); + add(JmlFieldDeclaration.class); + add(JmlClause.class); + add(JmlSimpleExprClause.class); + add(JmlMultiExprClause.class); + add(JmlSignalsClause.class); + add(JmlSignalsOnlyClause.class); + add(JmlClauseLabel.class); + add(JmlForallClause.class); + add(JmlOldClause.class); + add(JmlCallableClause.class); + add(JmlClauseIf.class); + add(JmlMethodSignature.class); + add(com.github.javaparser.ast.jml.clauses.JmlContract.class); + + //add(com.github.javaparser.ast.JmlBoundVariable.class); + + add(JmlClassExprDeclaration.class); + add(JmlRepresentsDeclaration.class); + add(JmlClassAccessibleDeclaration.class); add(com.github.javaparser.ast.type.ArrayType.class); add(com.github.javaparser.ast.type.ClassOrInterfaceType.class); diff --git a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java index 449f391704..22b5caf93f 100644 --- a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java +++ b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java @@ -36,7 +36,7 @@ import java.util.*; import static com.github.javaparser.StaticJavaParser.*; -import static com.github.javaparser.ast.Modifier.Keyword.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.CodeGenerationUtils.optionalOf; import static com.github.javaparser.utils.Utils.decapitalize; diff --git a/javaparser-core-serialization/pom.xml b/javaparser-core-serialization/pom.xml index 1125178c98..e46a91bcd6 100644 --- a/javaparser-core-serialization/pom.xml +++ b/javaparser-core-serialization/pom.xml @@ -23,10 +23,6 @@ - - 1.8 - - @@ -59,6 +55,11 @@ jakarta.json-api 2.1.3 + + com.google.truth + truth + test + org.eclipse.parsson diff --git a/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java b/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java index 18caf1abaa..91e53eb6af 100644 --- a/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java +++ b/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java @@ -22,6 +22,7 @@ import com.github.javaparser.*; import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.comments.Comment; @@ -108,7 +109,7 @@ private Node deserializeObject(JsonObject nodeJson) { parameters.put(name, Boolean.parseBoolean(nodeJson.getString(name))); } else if (Enum.class.isAssignableFrom(type)) { parameters.put(name, Enum.valueOf((Class) type, nodeJson.getString(name))); - } else if (type == Modifier.Keyword.class) { + } else if (type == Modifier.DefaultKeyword.class) { //TODO weigl handle JmlDocModifier? parameters.put(name, Enum.valueOf(Modifier.DefaultKeyword.class, nodeJson.getString(name))); } else { diff --git a/javaparser-core-serialization/src/test/java/com/github/javaparser/serialization/JavaParserJsonSerializerTest.java b/javaparser-core-serialization/src/test/java/com/github/javaparser/serialization/JavaParserJsonSerializerTest.java index 69501db3ed..f130644df7 100644 --- a/javaparser-core-serialization/src/test/java/com/github/javaparser/serialization/JavaParserJsonSerializerTest.java +++ b/javaparser-core-serialization/src/test/java/com/github/javaparser/serialization/JavaParserJsonSerializerTest.java @@ -23,18 +23,22 @@ import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; +import com.google.common.truth.Truth; import jakarta.json.Json; import jakarta.json.stream.JsonGenerator; import jakarta.json.stream.JsonGeneratorFactory; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; import java.util.HashMap; import java.util.Map; import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.assertEquals; + class JavaParserJsonSerializerTest { @Test @@ -45,7 +49,7 @@ void test() throws IOException { InputStream is = getClass().getResourceAsStream("/example.json"); byte[] buffer = new byte[1024 * 1024]; int len = is.read(buffer); - Assume.assumeTrue(len > 0); + Assumptions.assumeTrue(len > 0); String expected = new String(buffer, 0, len); System.out.println(serialized); Truth.assertThat(serialized).isEqualTo(expected); diff --git a/javaparser-core-testing-bdd/src/test/java/com/github/javaparser/steps/ManipulationSteps.java b/javaparser-core-testing-bdd/src/test/java/com/github/javaparser/steps/ManipulationSteps.java index 6002ce161f..c44de1cd7b 100644 --- a/javaparser-core-testing-bdd/src/test/java/com/github/javaparser/steps/ManipulationSteps.java +++ b/javaparser-core-testing-bdd/src/test/java/com/github/javaparser/steps/ManipulationSteps.java @@ -22,7 +22,7 @@ package com.github.javaparser.steps; import static com.github.javaparser.StaticJavaParser.*; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static com.github.javaparser.ast.Modifier.staticModifier; import static com.github.javaparser.ast.NodeList.nodeList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java index ac7a19c31d..1d9aa8155b 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java @@ -98,7 +98,7 @@ void sealedClass() { assertFalse(x.isInnerClass()); assertFalse(x.isNestedType()); assertFalse(x.isLocalClassDeclaration()); - assertTrue(x.hasModifier(Modifier.Keyword.SEALED)); + assertTrue(x.hasModifier(Modifier.DefaultKeyword.SEALED)); assertEquals(x.getPermittedTypes().size(), 2); assertEquals(x.getPermittedTypes().get(0).getNameAsString(), "Y"); assertEquals(x.getPermittedTypes().get(1).getNameAsString(), "Z"); @@ -113,7 +113,7 @@ void nonSealedClass() { assertFalse(x.isInnerClass()); assertFalse(x.isNestedType()); assertFalse(x.isLocalClassDeclaration()); - assertTrue(x.hasModifier(Modifier.Keyword.NON_SEALED)); + assertTrue(x.hasModifier(Modifier.DefaultKeyword.NON_SEALED)); } @ParameterizedTest diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java index 8f8f383621..d18d8e197f 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java @@ -341,7 +341,7 @@ void record_isImplicitlyFinal() { RecordDeclaration recordDeclaration = cu.findFirst(RecordDeclaration.class).get(); - assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.FINAL)); + assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.FINAL)); assertTrue(recordDeclaration.isFinal(), "Records are implicitly final."); } @@ -356,7 +356,7 @@ void record_isImplicitlyFinalWithoutExplicit() { RecordDeclaration recordDeclaration = cu.findFirst(RecordDeclaration.class).get(); - assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.FINAL)); + assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.FINAL)); assertTrue(recordDeclaration.isFinal(), "Records are implicitly final."); } @@ -541,7 +541,7 @@ void record_topLevelRecordsAreNotStatic() { RecordDeclaration recordDeclaration = cu.findAll(RecordDeclaration.class).get(0); - assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.STATIC)); + assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.STATIC)); assertFalse(recordDeclaration.isStatic(), "Top level Records are NOT implicitly static."); } @@ -557,7 +557,7 @@ void record_nestedRecordsAreImplicitlyStatic() { RecordDeclaration recordDeclaration = cu.findAll(RecordDeclaration.class).get(0); - assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.STATIC)); + assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.STATIC)); assertTrue(recordDeclaration.isStatic(), "Nested Records are implicitly static."); } diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java index 064cf9b980..82489b8fde 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java @@ -21,7 +21,7 @@ package com.github.javaparser.ast.nodeTypes; -import static com.github.javaparser.ast.Modifier.Keyword.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.ast.Modifier.createModifierList; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -83,7 +83,7 @@ void keepModifiersThatShouldNotBeRemoved() { assertEquals(createModifierList(SYNCHRONIZED), node.getModifiers()); } - private NodeWithModifiers anythingWithModifiers(Modifier.Keyword... keywords) { + private NodeWithModifiers anythingWithModifiers(Modifier.DefaultKeyword... keywords) { ClassOrInterfaceDeclaration foo = new ClassOrInterfaceDeclaration(new NodeList<>(), false, "Foo"); foo.addModifier(keywords); return foo; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java index cd64f4a948..fde078b41f 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java @@ -22,8 +22,8 @@ package com.github.javaparser.builders; import static com.github.javaparser.StaticJavaParser.parseImport; -import static com.github.javaparser.ast.Modifier.Keyword.PRIVATE; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PRIVATE; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static org.junit.jupiter.api.Assertions.*; import com.github.javaparser.ast.CompilationUnit; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithMembersBuildersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithMembersBuildersTest.java index 29d2de8c5d..f0fee070a5 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithMembersBuildersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithMembersBuildersTest.java @@ -22,7 +22,7 @@ package com.github.javaparser.builders; import static com.github.javaparser.StaticJavaParser.*; -import static com.github.javaparser.ast.Modifier.Keyword.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static org.junit.jupiter.api.Assertions.*; import com.github.javaparser.ast.CompilationUnit; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java index d962bf1f18..b85de09a84 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java @@ -21,7 +21,7 @@ package com.github.javaparser.builders; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static org.junit.jupiter.api.Assertions.assertEquals; import com.github.javaparser.ast.CompilationUnit; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java index dfe1e6c694..9325a56407 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java @@ -23,7 +23,7 @@ import static com.github.javaparser.TokenTypes.eolTokenKind; import static com.github.javaparser.TokenTypes.spaceTokenKind; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static com.github.javaparser.printer.lexicalpreservation.DifferenceElement.*; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java index b3dbfabb50..292ecfeb06 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java @@ -39,7 +39,7 @@ public void test() { List kws = field.getModifiers().stream().map(Modifier::getKeyword).collect(Collectors.toList()); - kws.add(0, Modifier.Keyword.PROTECTED); + kws.add(0, Modifier.DefaultKeyword.PROTECTED); field.setModifiers(kws.toArray(new Modifier.Keyword[] {})); String expected = "class C { \r\n" + " protected static String S = \"s\";\r\n" + "}"; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java index db1baf8432..1728d27ce4 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java @@ -23,7 +23,7 @@ import static com.github.javaparser.TokenTypes.eolTokenKind; import static com.github.javaparser.TokenTypes.spaceTokenKind; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java index 70c22aa3fa..90b6a89dd0 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java @@ -22,7 +22,7 @@ package com.github.javaparser.printer.lexicalpreservation; import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter.NODE_TEXT_DATA; import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java index 518a871253..ea81745739 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java @@ -21,7 +21,7 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.STATIC; import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; import com.github.javaparser.StaticJavaParser; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationDeclarationTransformationsTest.java index 1f278ced04..4adfbff61e 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationDeclarationTransformationsTest.java @@ -21,8 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java index a5ee73cd41..58dd50dbd2 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java @@ -21,8 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java index c824ba23b3..52ede501ed 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java @@ -22,8 +22,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import com.github.javaparser.ast.NodeList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java index 5b35259680..757c07a902 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java @@ -21,8 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import com.github.javaparser.ast.NodeList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java index 07f5820112..7ff24dd46e 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java @@ -21,8 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import com.github.javaparser.ast.NodeList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java index 2785c98ddc..3a1d774c5c 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java @@ -21,8 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import com.github.javaparser.ast.NodeList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java index 896665c848..55b2a86014 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java @@ -23,8 +23,8 @@ import static com.github.javaparser.StaticJavaParser.parseExpression; import static com.github.javaparser.StaticJavaParser.parseStatement; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; @@ -223,7 +223,7 @@ void removingModifiersWithExistingAnnotationsShort() { @Test void removingPublicModifierFromPublicStaticMethod() { MethodDeclaration it = consider("public static void a(){}"); - it.removeModifier(Modifier.Keyword.PUBLIC); + it.removeModifier(Modifier.DefaultKeyword.PUBLIC); assertTransformedToString("static void a(){}", it); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java b/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java index 8c1b279e76..870150b8b9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java @@ -22,7 +22,6 @@ import static com.github.javaparser.ast.Node.NODE_BY_BEGIN_POSITION; import static java.util.stream.Collectors.toList; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; @@ -53,7 +52,8 @@ class CommentsInserter { * the comments. */ private void insertComments(CompilationUnit cu, TreeSet comments) { - if (comments.isEmpty()) return; + if (comments.isEmpty()) + return; /* I should sort all the direct children and the comments, if a comment is the first thing then it is a comment to the CompilationUnit */ // FIXME if there is no package it could be also a comment to the following class... @@ -61,10 +61,7 @@ private void insertComments(CompilationUnit cu, TreeSet comments) { // cases List children = cu.getChildNodes(); Comment firstComment = comments.iterator().next(); - if (cu.getPackageDeclaration().isPresent() - && (children.isEmpty() - || PositionUtils.areInOrder( - firstComment, cu.getPackageDeclaration().get()))) { + if (cu.getPackageDeclaration().isPresent() && (children.isEmpty() || PositionUtils.areInOrder(firstComment, cu.getPackageDeclaration().get()))) { cu.setComment(firstComment); comments.remove(firstComment); } @@ -75,7 +72,8 @@ private void insertComments(CompilationUnit cu, TreeSet comments) { * returns the node that were not attributed. */ void insertComments(Node node, TreeSet commentsToAttribute) { - if (commentsToAttribute.isEmpty()) return; + if (commentsToAttribute.isEmpty()) + return; if (node instanceof CompilationUnit) { insertComments((CompilationUnit) node, commentsToAttribute); } @@ -84,17 +82,12 @@ void insertComments(Node node, TreeSet commentsToAttribute) { 2) be outside all children. They could be preceding nothing, a comment or a child. If they preceed a child they are assigned to it, otherwise they remain "orphans" */ - List children = node.getChildNodes().stream() - . // Never attribute comments to modifiers. - filter(n -> !(n instanceof Modifier)) - .collect(toList()); + List children = node.getChildNodes().stream().// Never attribute comments to modifiers. + filter(n -> !(n instanceof Modifier)).collect(toList()); boolean attributeToAnnotation = !(configuration.isIgnoreAnnotationsWhenAttributingComments()); for (Node child : children) { TreeSet commentsInsideChild = new TreeSet<>(NODE_BY_BEGIN_POSITION); - commentsInsideChild.addAll(commentsToAttribute.stream() - .filter(comment -> comment.hasRange()) - .filter(comment -> PositionUtils.nodeContains(child, comment, !attributeToAnnotation)) - .collect(toList())); + commentsInsideChild.addAll(commentsToAttribute.stream().filter(comment -> comment.hasRange()).filter(comment -> PositionUtils.nodeContains(child, comment, !attributeToAnnotation)).collect(toList())); commentsToAttribute.removeAll(commentsInsideChild); insertComments(child, commentsInsideChild); } @@ -116,8 +109,7 @@ void insertComments(Node node, TreeSet commentsToAttribute) { childrenAndComments.addAll(children); commentsToAttribute.removeAll(attributedComments); childrenAndComments.addAll(commentsToAttribute); - PositionUtils.sortByBeginPosition( - childrenAndComments, configuration.isIgnoreAnnotationsWhenAttributingComments()); + PositionUtils.sortByBeginPosition(childrenAndComments, configuration.isIgnoreAnnotationsWhenAttributingComments()); for (Node thing : childrenAndComments) { if (thing instanceof Comment) { previousComment = (Comment) thing; @@ -126,8 +118,7 @@ void insertComments(Node node, TreeSet commentsToAttribute) { } } else { if (previousComment != null && !thing.getComment().isPresent()) { - if (!configuration.isDoNotAssignCommentsPrecedingEmptyLines() - || !thereAreLinesBetween(previousComment, thing)) { + if (!configuration.isDoNotAssignCommentsPrecedingEmptyLines() || !thereAreLinesBetween(previousComment, thing)) { thing.setComment(previousComment); attributedComments.add(previousComment); previousComment = null; @@ -148,19 +139,13 @@ private void attributeLineCommentsOnSameLine(TreeSet commentsToAttribut /* I can attribute in line comments to elements preceeding them, if there is something contained in their line */ List attributedComments = new LinkedList<>(); - commentsToAttribute.stream() - .filter(comment -> comment.hasRange()) - .filter(Comment::isLineComment) - .forEach(comment -> children.stream() - .filter(child -> child.hasRange()) - .forEach(child -> { - Range commentRange = comment.getRange().get(); - Range childRange = child.getRange().get(); - if (childRange.end.line == commentRange.begin.line - && attributeLineCommentToNodeOrChild(child, comment.asLineComment())) { - attributedComments.add(comment); - } - })); + commentsToAttribute.stream().filter(comment -> comment.hasRange()).filter(Comment::isLineComment).forEach(comment -> children.stream().filter(child -> child.hasRange()).forEach(child -> { + Range commentRange = comment.getRange().get(); + Range childRange = child.getRange().get(); + if (childRange.end.line == commentRange.begin.line && attributeLineCommentToNodeOrChild(child, comment.asLineComment())) { + attributedComments.add(comment); + } + })); commentsToAttribute.removeAll(attributedComments); } @@ -170,8 +155,7 @@ private boolean attributeLineCommentToNodeOrChild(Node node, LineComment lineCom } // The node start and end at the same line as the comment, // let's give to it the comment - if (node.getBegin().get().line == lineComment.getBegin().get().line - && !node.getComment().isPresent()) { + if (node.getBegin().get().line == lineComment.getBegin().get().line && !node.getComment().isPresent()) { if (!(node instanceof Comment)) { node.setComment(lineComment); } @@ -203,7 +187,8 @@ private boolean thereAreLinesBetween(Node a, Node b) { } private boolean commentIsOnNextLine(Node a, Comment c) { - if (!c.hasRange() || !a.hasRange()) return false; + if (!c.hasRange() || !a.hasRange()) + return false; return c.getRange().get().end.line + 1 == a.getRange().get().begin.line; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java b/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java index 290cccf026..7b43090d4b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java +++ b/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java @@ -28,7 +28,7 @@ /** * An object that can have a parent node. */ -public interface HasParentNode extends Observable { +public interface HasParentNode extends Observable { /** * Returns true if the parent has a parent @@ -87,7 +87,8 @@ default Optional findAncestor(Class type, Predicate predicate) { * @param */ default Optional findAncestor(Predicate predicate, Class... types) { - if (!hasParentNode()) return Optional.empty(); + if (!hasParentNode()) + return Optional.empty(); Node parent = getParentNode().get(); for (Class type : types) { if (type.isAssignableFrom(parent.getClass()) && predicate.test(type.cast(parent))) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java index 3ae71c5206..faad540fe3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java +++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java @@ -29,6 +29,7 @@ import com.github.javaparser.ast.body.Parameter; import com.github.javaparser.ast.body.TypeDeclaration; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.ArbitraryNodeContainer; import com.github.javaparser.ast.modules.ModuleDeclaration; import com.github.javaparser.ast.modules.ModuleDirective; import com.github.javaparser.ast.stmt.BlockStmt; @@ -37,13 +38,11 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.type.TypeParameter; - import java.io.*; import java.nio.charset.Charset; import java.nio.file.Path; import java.util.List; import java.util.function.Supplier; - import static com.github.javaparser.ParseStart.*; import static com.github.javaparser.Problem.PROBLEM_BY_BEGIN_POSITION; import static com.github.javaparser.Providers.provider; @@ -67,7 +66,7 @@ public final class JavaParser { * Instantiate the parser with default configuration. Note that parsing can also be done with the static methods {@link StaticJavaParser}. * Creating an instance will reduce setup time between parsing files. */ - public JavaParser() { + public JavaParser() { this(new ParserConfiguration()); } @@ -75,14 +74,14 @@ public JavaParser() { * Instantiate the parser. Note that parsing can also be done with the static methods {@link StaticJavaParser}. * Creating an instance will reduce setup time between parsing files. */ - public JavaParser(ParserConfiguration configuration) { + public JavaParser(ParserConfiguration configuration) { this.configuration = configuration; } /** * @return The configuration for this parser. */ - public ParserConfiguration getParserConfiguration() { + public ParserConfiguration getParserConfiguration() { return this.configuration; } @@ -113,11 +112,10 @@ private GeneratedJavaParser getParserForProvider(Provider provider) { * @param the subclass of Node that is the result of parsing in the start. * @return the parse result, a collection of encountered problems, and some extra data. */ - public ParseResult parse(ParseStart start, Provider provider) { + public ParseResult parse(ParseStart start, Provider provider) { assertNotNull(start); assertNotNull(provider); - List processors = - configuration.getProcessors().stream().map(Supplier::get).collect(toList()); + List processors = configuration.getProcessors().stream().map(Supplier::get).collect(toList()); for (Processor processor : processors) { provider = processor.preProcess(provider); } @@ -152,7 +150,7 @@ public ParseResult parse(ParseStart start, Provider provi * @return CompilationUnit representing the Java source code * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parse(final InputStream in, Charset encoding) { + public ParseResult parse(final InputStream in, Charset encoding) { return parse(COMPILATION_UNIT, provider(in, encoding)); } @@ -164,7 +162,7 @@ public ParseResult parse(final InputStream in, Charset encoding * @return CompilationUnit representing the Java source code * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parse(final InputStream in) { + public ParseResult parse(final InputStream in) { return parse(in, configuration.getCharacterEncoding()); } @@ -180,7 +178,7 @@ public ParseResult parse(final InputStream in) { * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public ParseResult parse(final File file, final Charset encoding) throws FileNotFoundException { + public ParseResult parse(final File file, final Charset encoding) throws FileNotFoundException { ParseResult result = parse(COMPILATION_UNIT, provider(file, encoding)); result.getResult().ifPresent(cu -> cu.setStorage(file.toPath(), encoding)); return result; @@ -195,9 +193,8 @@ public ParseResult parse(final File file, final Charset encodin * @throws ParseProblemException if the source code has parser errors * @throws FileNotFoundException the file was not found */ - public ParseResult parse(final File file) throws FileNotFoundException { - ParseResult result = - parse(COMPILATION_UNIT, provider(file, configuration.getCharacterEncoding())); + public ParseResult parse(final File file) throws FileNotFoundException { + ParseResult result = parse(COMPILATION_UNIT, provider(file, configuration.getCharacterEncoding())); result.getResult().ifPresent(cu -> cu.setStorage(file.toPath(), configuration.getCharacterEncoding())); return result; } @@ -214,7 +211,7 @@ public ParseResult parse(final File file) throws FileNotFoundEx * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public ParseResult parse(final Path path, final Charset encoding) throws IOException { + public ParseResult parse(final Path path, final Charset encoding) throws IOException { ParseResult result = parse(COMPILATION_UNIT, provider(path, encoding)); result.getResult().ifPresent(cu -> cu.setStorage(path, encoding)); return result; @@ -229,9 +226,8 @@ public ParseResult parse(final Path path, final Charset encodin * @throws ParseProblemException if the source code has parser errors * @throws IOException the path could not be accessed */ - public ParseResult parse(final Path path) throws IOException { - ParseResult result = - parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding())); + public ParseResult parse(final Path path) throws IOException { + ParseResult result = parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding())); result.getResult().ifPresent(cu -> cu.setStorage(path, configuration.getCharacterEncoding())); return result; } @@ -246,7 +242,7 @@ public ParseResult parse(final Path path) throws IOException { * @throws ParseProblemException if the source code has parser errors * @throws IOException the path could not be accessed */ - public ParseResult parseResource(final String path) throws IOException { + public ParseResult parseResource(final String path) throws IOException { return parse(COMPILATION_UNIT, resourceProvider(path, configuration.getCharacterEncoding())); } @@ -263,7 +259,7 @@ public ParseResult parseResource(final String path) throws IOEx * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public ParseResult parseResource(final String path, Charset encoding) throws IOException { + public ParseResult parseResource(final String path, Charset encoding) throws IOException { return parse(COMPILATION_UNIT, resourceProvider(path, encoding)); } @@ -280,8 +276,7 @@ public ParseResult parseResource(final String path, Charset enc * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public ParseResult parseResource( - final ClassLoader classLoader, final String path, Charset encoding) throws IOException { + public ParseResult parseResource(final ClassLoader classLoader, final String path, Charset encoding) throws IOException { return parse(COMPILATION_UNIT, resourceProvider(classLoader, path, encoding)); } @@ -293,7 +288,7 @@ public ParseResult parseResource( * @return CompilationUnit representing the Java source code * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parse(final Reader reader) { + public ParseResult parse(final Reader reader) { return parse(COMPILATION_UNIT, provider(reader)); } @@ -305,7 +300,7 @@ public ParseResult parse(final Reader reader) { * @return CompilationUnit representing the Java source code * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parse(String code) { + public ParseResult parse(String code) { return parse(COMPILATION_UNIT, provider(code)); } @@ -317,7 +312,7 @@ public ParseResult parse(String code) { * @return BlockStmt representing the Java block * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseBlock(final String blockStatement) { + public ParseResult parseBlock(final String blockStatement) { return parse(BLOCK, provider(blockStatement)); } @@ -329,7 +324,7 @@ public ParseResult parseBlock(final String blockStatement) { * @return Statement representing the Java statement * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseStatement(final String statement) { + public ParseResult parseStatement(final String statement) { return parse(STATEMENT, provider(statement)); } @@ -341,7 +336,7 @@ public ParseResult parseStatement(final String statement) { * @return ImportDeclaration representing the Java import declaration * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseImport(final String importDeclaration) { + public ParseResult parseImport(final String importDeclaration) { return parse(IMPORT_DECLARATION, provider(importDeclaration)); } @@ -354,7 +349,7 @@ public ParseResult parseImport(final String importDeclaration * @throws ParseProblemException if the source code has parser errors */ @SuppressWarnings("unchecked") - public ParseResult parseExpression(final String expression) { + public ParseResult parseExpression(final String expression) { return (ParseResult) parse(EXPRESSION, provider(expression)); } @@ -366,7 +361,7 @@ public ParseResult parseExpression(final String expres * @return AnnotationExpr representing the Java annotation * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseAnnotation(final String annotation) { + public ParseResult parseAnnotation(final String annotation) { return parse(ANNOTATION, provider(annotation)); } @@ -378,7 +373,7 @@ public ParseResult parseAnnotation(final String annotation) { * @return BodyDeclaration representing the Java annotation * @throws ParseProblemException if the source code has parser errors */ - public ParseResult> parseAnnotationBodyDeclaration(final String body) { + public ParseResult> parseAnnotationBodyDeclaration(final String body) { return parse(ANNOTATION_BODY, provider(body)); } @@ -391,7 +386,7 @@ public ParseResult> parseAnnotationBodyDeclaration(final Stri * @throws ParseProblemException if the source code has parser errors */ @SuppressWarnings("unchecked") - public > ParseResult parseBodyDeclaration(String body) { + public > ParseResult parseBodyDeclaration(String body) { return (ParseResult) parse(CLASS_BODY, provider(body)); } @@ -402,7 +397,7 @@ public > ParseResult parseBodyDeclaration(String * @return ClassOrInterfaceType representing the type * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseClassOrInterfaceType(String type) { + public ParseResult parseClassOrInterfaceType(String type) { return parse(CLASS_OR_INTERFACE_TYPE, provider(type)); } @@ -413,7 +408,7 @@ public ParseResult parseClassOrInterfaceType(String type) * @return ClassOrInterfaceType representing the type * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseType(String type) { + public ParseResult parseType(String type) { return parse(TYPE, provider(type)); } @@ -425,7 +420,7 @@ public ParseResult parseType(String type) { * @return VariableDeclarationExpr representing the type * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseVariableDeclarationExpr(String declaration) { + public ParseResult parseVariableDeclarationExpr(String declaration) { return parse(VARIABLE_DECLARATION_EXPR, provider(declaration)); } @@ -436,7 +431,7 @@ public ParseResult parseVariableDeclarationExpr(String * @return the AST for the statement. * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseExplicitConstructorInvocationStmt(String statement) { + public ParseResult parseExplicitConstructorInvocationStmt(String statement) { return parse(EXPLICIT_CONSTRUCTOR_INVOCATION_STMT, provider(statement)); } @@ -447,7 +442,7 @@ public ParseResult parseExplicitConstructorIn * @return the AST for the name * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseName(String qualifiedName) { + public ParseResult parseName(String qualifiedName) { return parse(NAME, provider(qualifiedName)); } @@ -458,7 +453,7 @@ public ParseResult parseName(String qualifiedName) { * @return the AST for the name * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseSimpleName(String name) { + public ParseResult parseSimpleName(String name) { return parse(SIMPLE_NAME, provider(name)); } @@ -469,7 +464,7 @@ public ParseResult parseSimpleName(String name) { * @return the AST for the parameter * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseParameter(String parameter) { + public ParseResult parseParameter(String parameter) { return parse(PARAMETER, provider(parameter)); } @@ -480,7 +475,7 @@ public ParseResult parseParameter(String parameter) { * @return the AST for the parameter * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parsePackageDeclaration(String packageDeclaration) { + public ParseResult parsePackageDeclaration(String packageDeclaration) { return parse(PACKAGE_DECLARATION, provider(packageDeclaration)); } @@ -491,7 +486,7 @@ public ParseResult parsePackageDeclaration(String packageDec * @return the AST for the type declaration * @throws ParseProblemException if the source code has parser errors */ - public ParseResult> parseTypeDeclaration(String typeDeclaration) { + public ParseResult> parseTypeDeclaration(String typeDeclaration) { return parse(TYPE_DECLARATION, provider(typeDeclaration)); } @@ -503,7 +498,7 @@ public ParseResult> parseTypeDeclaration(String typeDeclarati * @throws ParseProblemException if the source code has parser errors * @see ModuleDeclaration */ - public ParseResult parseModuleDeclaration(String moduleDeclaration) { + public ParseResult parseModuleDeclaration(String moduleDeclaration) { return parse(MODULE_DECLARATION, provider(moduleDeclaration)); } @@ -515,7 +510,7 @@ public ParseResult parseModuleDeclaration(String moduleDeclar * @throws ParseProblemException if the source code has parser errors * @see ModuleDirective */ - public ParseResult parseModuleDirective(String moduleDirective) { + public ParseResult parseModuleDirective(String moduleDirective) { return parse(MODULE_DIRECTIVE, provider(moduleDirective)); } @@ -526,7 +521,7 @@ public ParseResult parseModuleDirective(String moduleDirective) * @return the AST for the type parameter * @throws ParseProblemException if the source code has parser errors */ - public ParseResult parseTypeParameter(String typeParameter) { + public ParseResult parseTypeParameter(String typeParameter) { return parse(TYPE_PARAMETER, provider(typeParameter)); } @@ -538,7 +533,7 @@ public ParseResult parseTypeParameter(String typeParameter) { * @throws ParseProblemException if the source code has parser errors * @see MethodDeclaration */ - public ParseResult parseMethodDeclaration(String methodDeclaration) { + public ParseResult parseMethodDeclaration(String methodDeclaration) { return parse(METHOD_DECLARATION, provider(methodDeclaration)); } @@ -550,15 +545,15 @@ public ParseResult parseMethodDeclaration(String methodDeclar * @throws ParseProblemException if the source code has parser errors * @see ArrayInitializerExpr */ - public ParseResult parseArrayInitializerExpr(String arrayInitializerExpr) { + public ParseResult parseArrayInitializerExpr(String arrayInitializerExpr) { return parse(ARRAY_INITIALIZER_EXPR, provider(arrayInitializerExpr)); } - public ParseResult parseJmlMethodLevel(String content) { + public ParseResult parseJmlMethodLevel(String content) { return parseJmlMethodLevel(provider(content)); } - public ParseResult parseJmlMethodLevel(Provider provider) { + public ParseResult parseJmlMethodLevel(Provider provider) { return parse(enableJml(GeneratedJavaParser::JmlMethodLevelStart), provider); } @@ -569,36 +564,36 @@ private ParseStart enableJml(ParseStart start) { }; } - public ParseResult parseJmlClassLevel(String content) { + public ParseResult parseJmlClassLevel(String content) { return parseJmlClassLevel(provider(content)); } - public ParseResult parseJmlClassLevel(Provider content) { + public ParseResult parseJmlClassLevel(Provider content) { return parse(enableJml(GeneratedJavaParser::JmlClassLevelStart), content); } - public ParseResult parseJmlTypeLevel(String content) { + public ParseResult parseJmlTypeLevel(String content) { return parseJmlTypeLevel(provider(content)); } - public ParseResult parseJmlTypeLevel(Provider content) { + public ParseResult parseJmlTypeLevel(Provider content) { return parse(enableJml(GeneratedJavaParser::JmlTypeLevelStart), content); } - public ParseResult parseJmlModifierLevel(String content) { + public ParseResult parseJmlModifierLevel(String content) { return parseJmlModifierLevel(provider(content)); } - public ParseResult parseJmlModifierLevel(Provider content) { + public ParseResult parseJmlModifierLevel(Provider content) { return parse(enableJml(GeneratedJavaParser::JmlModifierLevelStart), content); } - public ParseResult parseJmlExpression(String content) { + public ParseResult parseJmlExpression(String content) { return parseJmlExpression(provider(content)); } @SuppressWarnings("unchecked") - public ParseResult parseJmlExpression(Provider content) { + public ParseResult parseJmlExpression(Provider content) { return (ParseResult) parse(enableJml(GeneratedJavaParser::ExpressionParseStart), content); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParserAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParserAdapter.java index b391bd1c18..ccb95d4f94 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/JavaParserAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParserAdapter.java @@ -41,7 +41,7 @@ import java.nio.file.Path; import java.util.Objects; -public class JavaParserAdapter { +public class JavaParserAdapter { /** * Wraps the {@link JavaParser}. @@ -56,11 +56,11 @@ public static JavaParserAdapter of(JavaParser parser) { private final JavaParser parser; - public JavaParserAdapter(JavaParser parser) { + public JavaParserAdapter(JavaParser parser) { this.parser = Objects.requireNonNull(parser, "A non-null parser should be provided."); } - public JavaParser getParser() { + public JavaParser getParser() { return parser; } @@ -80,119 +80,119 @@ private T handleResult(ParseResult result) { throw new ParseProblemException(result.getProblems()); } - public ParserConfiguration getParserConfiguration() { + public ParserConfiguration getParserConfiguration() { return parser.getParserConfiguration(); } - public CompilationUnit parse(InputStream in) { + public CompilationUnit parse(InputStream in) { return handleResult(getParser().parse(in)); } - public CompilationUnit parse(File file) throws FileNotFoundException { + public CompilationUnit parse(File file) throws FileNotFoundException { return handleResult(getParser().parse(file)); } - public CompilationUnit parse(Path path) throws IOException { + public CompilationUnit parse(Path path) throws IOException { return handleResult(getParser().parse(path)); } - public CompilationUnit parse(Reader reader) { + public CompilationUnit parse(Reader reader) { return handleResult(getParser().parse(reader)); } - public CompilationUnit parse(String code) { + public CompilationUnit parse(String code) { return handleResult(getParser().parse(code)); } - public CompilationUnit parseResource(String path) throws IOException { + public CompilationUnit parseResource(String path) throws IOException { return handleResult(getParser().parseResource(path)); } - public BlockStmt parseBlock(String blockStatement) { + public BlockStmt parseBlock(String blockStatement) { return handleResult(getParser().parseBlock(blockStatement)); } - public Statement parseStatement(String statement) { + public Statement parseStatement(String statement) { return handleResult(getParser().parseStatement(statement)); } - public ImportDeclaration parseImport(String importDeclaration) { + public ImportDeclaration parseImport(String importDeclaration) { return handleResult(getParser().parseImport(importDeclaration)); } - public T parseExpression(String expression) { + public T parseExpression(String expression) { return handleResult(getParser().parseExpression(expression)); } - public AnnotationExpr parseAnnotation(String annotation) { + public AnnotationExpr parseAnnotation(String annotation) { return handleResult(getParser().parseAnnotation(annotation)); } - public BodyDeclaration parseAnnotationBodyDeclaration(String body) { + public BodyDeclaration parseAnnotationBodyDeclaration(String body) { return handleResult(getParser().parseAnnotationBodyDeclaration(body)); } - public BodyDeclaration parseBodyDeclaration(String body) { + public BodyDeclaration parseBodyDeclaration(String body) { return handleResult(getParser().parseBodyDeclaration(body)); } - public ClassOrInterfaceType parseClassOrInterfaceType(String type) { + public ClassOrInterfaceType parseClassOrInterfaceType(String type) { return handleResult(getParser().parseClassOrInterfaceType(type)); } - public Type parseType(String type) { + public Type parseType(String type) { return handleResult(getParser().parseType(type)); } - public VariableDeclarationExpr parseVariableDeclarationExpr(String declaration) { + public VariableDeclarationExpr parseVariableDeclarationExpr(String declaration) { return handleResult(getParser().parseVariableDeclarationExpr(declaration)); } - public Javadoc parseJavadoc(String content) { + public Javadoc parseJavadoc(String content) { return JavadocParser.parse(content); } - public ExplicitConstructorInvocationStmt parseExplicitConstructorInvocationStmt(String statement) { + public ExplicitConstructorInvocationStmt parseExplicitConstructorInvocationStmt(String statement) { return handleResult(getParser().parseExplicitConstructorInvocationStmt(statement)); } - public Name parseName(String qualifiedName) { + public Name parseName(String qualifiedName) { return handleResult(getParser().parseName(qualifiedName)); } - public SimpleName parseSimpleName(String name) { + public SimpleName parseSimpleName(String name) { return handleResult(getParser().parseSimpleName(name)); } - public Parameter parseParameter(String parameter) { + public Parameter parseParameter(String parameter) { return handleResult(getParser().parseParameter(parameter)); } - public PackageDeclaration parsePackageDeclaration(String packageDeclaration) { + public PackageDeclaration parsePackageDeclaration(String packageDeclaration) { return handleResult(getParser().parsePackageDeclaration(packageDeclaration)); } - public TypeDeclaration parseTypeDeclaration(String typeDeclaration) { + public TypeDeclaration parseTypeDeclaration(String typeDeclaration) { return handleResult(getParser().parseTypeDeclaration(typeDeclaration)); } - public ModuleDeclaration parseModuleDeclaration(String moduleDeclaration) { + public ModuleDeclaration parseModuleDeclaration(String moduleDeclaration) { return handleResult(getParser().parseModuleDeclaration(moduleDeclaration)); } - public ModuleDirective parseModuleDirective(String moduleDirective) { + public ModuleDirective parseModuleDirective(String moduleDirective) { return handleResult(getParser().parseModuleDirective(moduleDirective)); } - public TypeParameter parseTypeParameter(String typeParameter) { + public TypeParameter parseTypeParameter(String typeParameter) { return handleResult(getParser().parseTypeParameter(typeParameter)); } - public MethodDeclaration parseMethodDeclaration(String methodDeclaration) { + public MethodDeclaration parseMethodDeclaration(String methodDeclaration) { return handleResult(getParser().parseMethodDeclaration(methodDeclaration)); } - public ArrayInitializerExpr parseArrayInitializerExpr(String arrayInitializerExpr) { + public ArrayInitializerExpr parseArrayInitializerExpr(String arrayInitializerExpr) { return handleResult(getParser().parseArrayInitializerExpr(arrayInitializerExpr)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java b/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java index 1f28d0f88e..3d0c6ea9db 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java +++ b/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java @@ -22,7 +22,6 @@ import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.ast.Generated; import com.github.javaparser.utils.LineSeparator; import java.util.List; @@ -33,7 +32,7 @@ * (Awkwardly named "Java"Token since JavaCC already generates an internal class Token.) * It is a node in a double linked list called token list. */ -public class JavaToken { +public class JavaToken { public static final JavaToken INVALID = new JavaToken(); @@ -51,7 +50,7 @@ private JavaToken() { this(null, 0, "INVALID", null, null); } - public JavaToken(int kind, String text) { + public JavaToken(int kind, String text) { this(null, kind, text, null, null); } @@ -111,7 +110,7 @@ public JavaToken(int kind, String text) { /** * Create a token of a certain kind. */ - public JavaToken(int kind) { + public JavaToken(int kind) { String content = GeneratedJavaParserConstants.tokenImage[kind]; if (content.startsWith("\"")) { content = content.substring(1, content.length() - 1); @@ -125,7 +124,7 @@ public JavaToken(int kind) { this.text = content; } - public JavaToken(Range range, int kind, String text, JavaToken previousToken, JavaToken nextToken) { + public JavaToken(Range range, int kind, String text, JavaToken previousToken, JavaToken nextToken) { assertNotNull(text); this.range = range; this.kind = kind; @@ -134,18 +133,18 @@ public JavaToken(Range range, int kind, String text, JavaToken previousToken, Ja this.nextToken = nextToken; } - public Optional getRange() { + public Optional getRange() { return Optional.ofNullable(range); } /* * Returns true if the token has a range */ - public boolean hasRange() { + public boolean hasRange() { return getRange().isPresent(); } - public int getKind() { + public int getKind() { return kind; } @@ -153,64 +152,59 @@ void setKind(int kind) { this.kind = kind; } - public String getText() { + public String getText() { return text; } - public Optional getNextToken() { + public Optional getNextToken() { return Optional.ofNullable(nextToken); } - public Optional getPreviousToken() { + public Optional getPreviousToken() { return Optional.ofNullable(previousToken); } - public void setRange(Range range) { + public void setRange(Range range) { this.range = range; } - public void setText(String text) { + public void setText(String text) { this.text = text; } - public String asString() { + public String asString() { return text; } /** * @return the token range that goes from the beginning to the end of the token list this token is a part of. */ - public TokenRange toTokenRange() { + public TokenRange toTokenRange() { return new TokenRange(findFirstToken(), findLastToken()); } @Override - public String toString() { - String text = getText() - .replace("\n", "\\n") - .replace("\r", "\\r") - .replace("\r\n", "\\r\\n") - .replace("\t", "\\t"); - return f( - "\"%s\" <%s> %s", - text, getKind(), getRange().map(Range::toString).orElse("(?)-(?)")); + public String toString() { + String text = getText().replace("\n", "\\n").replace("\r", "\\r").replace("\r\n", "\\r\\n").replace("\t", "\\t"); + return f("\"%s\" <%s> %s", text, getKind(), getRange().map(Range::toString).orElse("(?)-(?)")); } /** * Used by the parser while constructing nodes. No tokens should be invalid when the parser is done. */ - public boolean valid() { + public boolean valid() { return !invalid(); } /** * Used by the parser while constructing nodes. No tokens should be invalid when the parser is done. */ - public boolean invalid() { + public boolean invalid() { return this == INVALID; } - public enum Category { + public enum Category { + WHITESPACE_NO_EOL, EOL, COMMENT, @@ -220,201 +214,393 @@ public enum Category { SEPARATOR, OPERATOR; - public boolean isWhitespaceOrComment() { + public boolean isWhitespaceOrComment() { return isWhitespace() || this == COMMENT; } - public boolean isWhitespace() { + public boolean isWhitespace() { return this == WHITESPACE_NO_EOL || this == EOL; } - public boolean isEndOfLine() { + public boolean isEndOfLine() { return this == EOL; } - public boolean isComment() { + public boolean isComment() { return this == COMMENT; } - public boolean isWhitespaceButNotEndOfLine() { + public boolean isWhitespaceButNotEndOfLine() { return this == WHITESPACE_NO_EOL; } - public boolean isIdentifier() { + public boolean isIdentifier() { return this == IDENTIFIER; } - public boolean isKeyword() { + public boolean isKeyword() { return this == KEYWORD; } - public boolean isLiteral() { + public boolean isLiteral() { return this == LITERAL; } - public boolean isSeparator() { + public boolean isSeparator() { return this == SEPARATOR; } - public boolean isOperator() { + public boolean isOperator() { return this == OPERATOR; } } @Generated("com.github.javaparser.generator.core.other.TokenKindGenerator") - public enum Kind { + public enum Kind { + EOF(0), SPACE(1), WINDOWS_EOL(2), UNIX_EOL(3), OLD_MAC_EOL(4), - SINGLE_LINE_COMMENT(5), - ENTER_JAVADOC_COMMENT(6), - ENTER_MULTILINE_COMMENT(7), - JAVADOC_COMMENT(8), - MULTI_LINE_COMMENT(9), - COMMENT_CONTENT(10), - ABSTRACT(11), - ASSERT(12), - BOOLEAN(13), - BREAK(14), - BYTE(15), - CASE(16), - CATCH(17), - CHAR(18), - CLASS(19), - CONST(20), - CONTINUE(21), - _DEFAULT(22), - DO(23), - DOUBLE(24), - ELSE(25), - ENUM(26), - EXTENDS(27), - FALSE(28), - FINAL(29), - FINALLY(30), - FLOAT(31), - FOR(32), - GOTO(33), - IF(34), - IMPLEMENTS(35), - IMPORT(36), - INSTANCEOF(37), - INT(38), - INTERFACE(39), - LONG(40), - NATIVE(41), - NEW(42), - NON_SEALED(43), - NULL(44), - PACKAGE(45), - PERMITS(46), - PRIVATE(47), - PROTECTED(48), - PUBLIC(49), - RECORD(50), - RETURN(51), - SEALED(52), - SHORT(53), - STATIC(54), - STRICTFP(55), - SUPER(56), - SWITCH(57), - SYNCHRONIZED(58), - THIS(59), - THROW(60), - THROWS(61), - TRANSIENT(62), - TRUE(63), - TRY(64), - VOID(65), - VOLATILE(66), - WHILE(67), - YIELD(68), - REQUIRES(69), - TO(70), - WITH(71), - OPEN(72), - OPENS(73), - USES(74), - MODULE(75), - EXPORTS(76), - PROVIDES(77), - TRANSITIVE(78), - WHEN(79), - LONG_LITERAL(80), - INTEGER_LITERAL(81), - DECIMAL_LITERAL(82), - HEX_LITERAL(83), - OCTAL_LITERAL(84), - BINARY_LITERAL(85), - FLOATING_POINT_LITERAL(86), - DECIMAL_FLOATING_POINT_LITERAL(87), - DECIMAL_EXPONENT(88), - HEXADECIMAL_FLOATING_POINT_LITERAL(89), - HEXADECIMAL_EXPONENT(90), - HEX_DIGITS(91), - UNICODE_ESCAPE(92), - CHARACTER_LITERAL(93), - STRING_LITERAL(94), - ENTER_TEXT_BLOCK(95), - TEXT_BLOCK_LITERAL(96), - TEXT_BLOCK_CONTENT(97), - IDENTIFIER(98), - LETTER(99), - PART_LETTER(100), - LPAREN(101), - RPAREN(102), - LBRACE(103), - RBRACE(104), - LBRACKET(105), - RBRACKET(106), - SEMICOLON(107), - COMMA(108), - DOT(109), - ELLIPSIS(110), - AT(111), - DOUBLECOLON(112), - ASSIGN(113), - LT(114), - BANG(115), - TILDE(116), - HOOK(117), - COLON(118), - ARROW(119), - EQ(120), - GE(121), - LE(122), - NE(123), - SC_AND(124), - SC_OR(125), - INCR(126), - DECR(127), - PLUS(128), - MINUS(129), - STAR(130), - SLASH(131), - BIT_AND(132), - BIT_OR(133), - XOR(134), - REM(135), - LSHIFT(136), - PLUSASSIGN(137), - MINUSASSIGN(138), - STARASSIGN(139), - SLASHASSIGN(140), - ANDASSIGN(141), - ORASSIGN(142), - XORASSIGN(143), - REMASSIGN(144), - LSHIFTASSIGN(145), - RSIGNEDSHIFTASSIGN(146), - RUNSIGNEDSHIFTASSIGN(147), - RUNSIGNEDSHIFT(148), - RSIGNEDSHIFT(149), - GT(150), - CTRL_Z(151); + INVARIANT(5), + ABRUPT_BEHAVIOR(6), + ABRUPT_BEHAVIOUR(7), + MODEL_BEHAVIOR(8), + MODEL_BEHAVIOUR(9), + ACCESSIBLE(10), + ACCESSIBLE_REDUNDANTLY(11), + ALSO(12), + ANTIVALENCE(13), + ASSERT_REDUNDANTLY(14), + ASSIGNABLE(15), + ASSIGNABLE_REDUNDANTLY(16), + ASSUME(17), + ASSUME_REDUNDANTLY(18), + AXIOM(19), + BEHAVIOR(20), + BEHAVIOUR(21), + BIGINT(22), + BIGINT_MATH(23), + BREAKS(24), + BREAKS_REDUNDANTLY(25), + BREAK_BEHAVIOR(26), + BREAK_BEHAVIOUR(27), + CALLABLE(28), + CALLABLE_REDUNDANTLY(29), + CAPTURES(30), + CAPTURES_REDUNDANTLY(31), + CHOOSE(32), + CHOOSE_IF(33), + CODE(34), + CODE_BIGINT_MATH(35), + CODE_JAVA_MATH(36), + CODE_SAFE_MATH(37), + IMMUTABLE(38), + CONSTRAINT(39), + CONSTRAINT_REDUNDANTLY(40), + CONSTRUCTOR(41), + CONTINUES(42), + CONTINUES_REDUNDANTLY(43), + CONTINUE_BEHAVIOR(44), + CONTINUE_BEHAVIOUR(45), + DECLASSIFIES(46), + DECREASES(47), + DECREASES_REDUNDANTLY(48), + DECREASING(49), + DECREASING_REDUNDANTLY(50), + DETERMINES(51), + DIVERGES(52), + DIVERGES_REDUNDANTLY(53), + DURATION(54), + DURATION_REDUNDANTLY(55), + ENSURES(56), + ENSURES_REDUNDANTLY(57), + ENSURES_FREE(58), + REQUIRES_FREE(59), + EQUIVALENCE(60), + IMPLICATION(61), + IMPLICATION_BACKWARD(62), + ERASES(63), + EXAMPLE(64), + EXCEPTIONAL_BEHAVIOR(65), + EXCEPTIONAL_BEHAVIOUR(66), + EXCEPTIONAL_EXAMPLE(67), + EXISTS(68), + EXSURES(69), + EXSURES_REDUNDANTLY(70), + EXTRACT(71), + FIELD(72), + FORALLQ(73), + LET(74), + FORALL(75), + FOR_EXAMPLE(76), + PEER(77), + REP(78), + READ_ONLY(79), + GHOST(80), + BEGIN(81), + END(82), + HELPER(83), + HENCE_BY(84), + HENCE_BY_REDUNDANTLY(85), + IMPLIES_THAT(86), + IN(87), + INITIALIZER(88), + INITIALLY(89), + INSTANCE(90), + TWO_STATE(91), + NO_STATE(92), + NON_NULL_BY_DEFAULT(93), + INVARIANT_REDUNDANTLY(94), + IN_REDUNDANTLY(95), + JAVA_MATH(96), + LBLNEG(97), + LBLPOS(98), + LBL(99), + LOOP_CONTRACT(100), + LOOP_INVARIANT(101), + LOOP_INVARIANT_FREE(102), + LOOP_INVARIANT_REDUNDANTLY(103), + MAINTAINING(104), + MAINTAINING_REDUNDANTLY(105), + MAPS(106), + MAPS_REDUNDANTLY(107), + MAX(108), + MEASURED_BY(109), + ESC_MEASURED_BY(110), + MEASURED_BY_REDUNDANTLY(111), + METHOD(112), + MIN(113), + MODEL(114), + MODEL_PROGRAM(115), + MODIFIABLE(116), + MODIFIABLE_REDUNDANTLY(117), + LOOP_MODIFIES(118), + MODIFIES(119), + MODIFIES_REDUNDANTLY(120), + MONITORED(121), + MONITORS_FOR(122), + NESTED_CONTRACT_END(123), + NESTED_CONTRACT_START(124), + NEW_OBJECT(125), + NONNULLELEMENTS(126), + NON_NULL(127), + NORMAL_BEHAVIOR(128), + NORMAL_BEHAVIOUR(129), + FEASIBLE_BEHAVIOR(130), + FEASIBLE_BEHAVIOUR(131), + NORMAL_EXAMPLE(132), + NOWARN(133), + NOWARN_OP(134), + NULLABLE(135), + NULLABLE_BY_DEFAULT(136), + NUM_OF(137), + OLD(138), + OR(139), + POST(140), + POST_REDUNDANTLY(141), + PRE_ESC(142), + PRE(143), + PRE_REDUNDANTLY(144), + PRODUCT(145), + PURE(146), + READABLE(147), + REFINING(148), + REPRESENTS(149), + REPRESENTS_REDUNDANTLY(150), + REQUIRES_REDUNDANTLY(151), + RESULT(152), + RETURNS(153), + RETURNS_REDUNDANTLY(154), + RETURN_BEHAVIOR(155), + BACKARROW(156), + RETURN_BEHAVIOUR(157), + SAFE_MATH(158), + SET(159), + SIGNALS(160), + SIGNALS_ONLY(161), + SIGNALS_ONLY_REDUNDANTLY(162), + SIGNALS_REDUNDANTLY(163), + SPEC_BIGINT_MATH(164), + SPEC_JAVA_MATH(165), + SPEC_PACKAGE(166), + SPEC_PRIVATE(167), + SPEC_PROTECTED(168), + SPEC_PUBLIC(169), + SPEC_SAFE_MATH(170), + STATIC_INITIALIZER(171), + STRICTLY_PURE(172), + SUBTYPE(173), + SUCH_THAT(174), + SUM(175), + TYPE(176), + UNINITIALIZED(177), + UNKNOWN_OP(178), + UNKNOWN_OP_EQ(179), + UNREACHABLE(180), + WARN(181), + WARN_OP(182), + WHEN_REDUNDANTLY(183), + WORKING_SPACE_ESC(184), + WORKING_SPACE(185), + WORKING_SPACE_REDUNDANTLY(186), + WRITABLE(187), + DOTDOT(188), + JML_LINE_COMMENT(189), + SINGLE_LINE_COMMENT(190), + JML_ENTER_MULTILINE_COMMENT(191), + ENTER_JAVADOC_COMMENT(192), + ENTER_JML_BLOCK_COMMENT(193), + ENTER_MULTILINE_COMMENT(194), + JML_BLOCK_COMMENT(195), + JAVADOC_COMMENT(196), + MULTI_LINE_COMMENT(197), + JML_MULTI_LINE_COMMENT(198), + COMMENT_CONTENT(199), + ABSTRACT(200), + ASSERT(201), + BOOLEAN(202), + BREAK(203), + BYTE(204), + CASE(205), + CATCH(206), + CHAR(207), + CLASS(208), + CONST(209), + CONTINUE(210), + _DEFAULT(211), + DO(212), + DOUBLE(213), + ELSE(214), + ENUM(215), + EXTENDS(216), + FALSE(217), + FINAL(218), + FINALLY(219), + FLOAT(220), + FOR(221), + GOTO(222), + IF(223), + IMPLEMENTS(224), + IMPORT(225), + INSTANCEOF(226), + INT(227), + INTERFACE(228), + LONG(229), + NATIVE(230), + NEW(231), + NON_SEALED(232), + NULL(233), + PACKAGE(234), + PERMITS(235), + PRIVATE(236), + PROTECTED(237), + PUBLIC(238), + RECORD(239), + RETURN(240), + SEALED(241), + SHORT(242), + STATIC(243), + STRICTFP(244), + SUPER(245), + SWITCH(246), + SYNCHRONIZED(247), + THIS(248), + THROW(249), + THROWS(250), + TRANSIENT(251), + TRUE(252), + TRY(253), + VOID(254), + VOLATILE(255), + WHILE(256), + YIELD(257), + REQUIRES(258), + TO(259), + WITH(260), + OPEN(261), + OPENS(262), + USES(263), + MODULE(264), + EXPORTS(265), + PROVIDES(266), + TRANSITIVE(267), + WHEN(268), + LONG_LITERAL(269), + INTEGER_LITERAL(270), + DECIMAL_LITERAL(271), + HEX_LITERAL(272), + OCTAL_LITERAL(273), + BINARY_LITERAL(274), + FLOATING_POINT_LITERAL(275), + DECIMAL_FLOATING_POINT_LITERAL(276), + DECIMAL_EXPONENT(277), + HEXADECIMAL_FLOATING_POINT_LITERAL(278), + HEXADECIMAL_EXPONENT(279), + HEX_DIGITS(280), + UNICODE_ESCAPE(281), + CHARACTER_LITERAL(282), + STRING_LITERAL(283), + ENTER_TEXT_BLOCK(284), + TEXT_BLOCK_LITERAL(285), + TEXT_BLOCK_CONTENT(286), + JML_IDENTIFIER(287), + IDENTIFIER(288), + SYNTH_IDENTIFIER(289), + LETTER(290), + PART_LETTER(291), + LPAREN(292), + RPAREN(293), + LBRACE(294), + RBRACE(295), + LBRACKET(296), + RBRACKET(297), + SEMICOLON(298), + COMMA(299), + DOT(300), + ELLIPSIS(301), + AT(302), + DOUBLECOLON(303), + ASSIGN(304), + LT(305), + BANG(306), + TILDE(307), + HOOK(308), + COLON(309), + ARROW(310), + EQ(311), + GE(312), + LE(313), + NE(314), + SC_AND(315), + SC_OR(316), + INCR(317), + DECR(318), + PLUS(319), + MINUS(320), + STAR(321), + SLASH(322), + BIT_AND(323), + BIT_OR(324), + XOR(325), + REM(326), + LSHIFT(327), + PLUSASSIGN(328), + MINUSASSIGN(329), + STARASSIGN(330), + SLASHASSIGN(331), + ANDASSIGN(332), + ORASSIGN(333), + XORASSIGN(334), + REMASSIGN(335), + LSHIFTASSIGN(336), + RSIGNEDSHIFTASSIGN(337), + RUNSIGNEDSHIFTASSIGN(338), + RUNSIGNEDSHIFT(339), + RSIGNEDSHIFT(340), + GT(341), + CTRL_Z(342); private final int kind; @@ -423,301 +609,683 @@ public enum Kind { } public static Kind valueOf(int kind) { - switch (kind) { - case 151: + switch(kind) { + case 342: return CTRL_Z; - case 150: + case 341: return GT; - case 149: + case 340: return RSIGNEDSHIFT; - case 148: + case 339: return RUNSIGNEDSHIFT; - case 147: + case 338: return RUNSIGNEDSHIFTASSIGN; - case 146: + case 337: return RSIGNEDSHIFTASSIGN; - case 145: + case 336: return LSHIFTASSIGN; - case 144: + case 335: return REMASSIGN; - case 143: + case 334: return XORASSIGN; - case 142: + case 333: return ORASSIGN; - case 141: + case 332: return ANDASSIGN; - case 140: + case 331: return SLASHASSIGN; - case 139: + case 330: return STARASSIGN; - case 138: + case 329: return MINUSASSIGN; - case 137: + case 328: return PLUSASSIGN; - case 136: + case 327: return LSHIFT; - case 135: + case 326: return REM; - case 134: + case 325: return XOR; - case 133: + case 324: return BIT_OR; - case 132: + case 323: return BIT_AND; - case 131: + case 322: return SLASH; - case 130: + case 321: return STAR; - case 129: + case 320: return MINUS; - case 128: + case 319: return PLUS; - case 127: + case 318: return DECR; - case 126: + case 317: return INCR; - case 125: + case 316: return SC_OR; - case 124: + case 315: return SC_AND; - case 123: + case 314: return NE; - case 122: + case 313: return LE; - case 121: + case 312: return GE; - case 120: + case 311: return EQ; - case 119: + case 310: return ARROW; - case 118: + case 309: return COLON; - case 117: + case 308: return HOOK; - case 116: + case 307: return TILDE; - case 115: + case 306: return BANG; - case 114: + case 305: return LT; - case 113: + case 304: return ASSIGN; - case 112: + case 303: return DOUBLECOLON; - case 111: + case 302: return AT; - case 110: + case 301: return ELLIPSIS; - case 109: + case 300: return DOT; - case 108: + case 299: return COMMA; - case 107: + case 298: return SEMICOLON; - case 106: + case 297: return RBRACKET; - case 105: + case 296: return LBRACKET; - case 104: + case 295: return RBRACE; - case 103: + case 294: return LBRACE; - case 102: + case 293: return RPAREN; - case 101: + case 292: return LPAREN; - case 100: + case 291: return PART_LETTER; - case 99: + case 290: return LETTER; - case 98: + case 289: + return SYNTH_IDENTIFIER; + case 288: return IDENTIFIER; - case 97: + case 287: + return JML_IDENTIFIER; + case 286: return TEXT_BLOCK_CONTENT; - case 96: + case 285: return TEXT_BLOCK_LITERAL; - case 95: + case 284: return ENTER_TEXT_BLOCK; - case 94: + case 283: return STRING_LITERAL; - case 93: + case 282: return CHARACTER_LITERAL; - case 92: + case 281: return UNICODE_ESCAPE; - case 91: + case 280: return HEX_DIGITS; - case 90: + case 279: return HEXADECIMAL_EXPONENT; - case 89: + case 278: return HEXADECIMAL_FLOATING_POINT_LITERAL; - case 88: + case 277: return DECIMAL_EXPONENT; - case 87: + case 276: return DECIMAL_FLOATING_POINT_LITERAL; - case 86: + case 275: return FLOATING_POINT_LITERAL; - case 85: + case 274: return BINARY_LITERAL; - case 84: + case 273: return OCTAL_LITERAL; - case 83: + case 272: return HEX_LITERAL; - case 82: + case 271: return DECIMAL_LITERAL; - case 81: + case 270: return INTEGER_LITERAL; - case 80: + case 269: return LONG_LITERAL; - case 79: + case 268: return WHEN; - case 78: + case 267: return TRANSITIVE; - case 77: + case 266: return PROVIDES; - case 76: + case 265: return EXPORTS; - case 75: + case 264: return MODULE; - case 74: + case 263: return USES; - case 73: + case 262: return OPENS; - case 72: + case 261: return OPEN; - case 71: + case 260: return WITH; - case 70: + case 259: return TO; - case 69: + case 258: return REQUIRES; - case 68: + case 257: return YIELD; - case 67: + case 256: return WHILE; - case 66: + case 255: return VOLATILE; - case 65: + case 254: return VOID; - case 64: + case 253: return TRY; - case 63: + case 252: return TRUE; - case 62: + case 251: return TRANSIENT; - case 61: + case 250: return THROWS; - case 60: + case 249: return THROW; - case 59: + case 248: return THIS; - case 58: + case 247: return SYNCHRONIZED; - case 57: + case 246: return SWITCH; - case 56: + case 245: return SUPER; - case 55: + case 244: return STRICTFP; - case 54: + case 243: return STATIC; - case 53: + case 242: return SHORT; - case 52: + case 241: return SEALED; - case 51: + case 240: return RETURN; - case 50: + case 239: return RECORD; - case 49: + case 238: return PUBLIC; - case 48: + case 237: return PROTECTED; - case 47: + case 236: return PRIVATE; - case 46: + case 235: return PERMITS; - case 45: + case 234: return PACKAGE; - case 44: + case 233: return NULL; - case 43: + case 232: return NON_SEALED; - case 42: + case 231: return NEW; - case 41: + case 230: return NATIVE; - case 40: + case 229: return LONG; - case 39: + case 228: return INTERFACE; - case 38: + case 227: return INT; - case 37: + case 226: return INSTANCEOF; - case 36: + case 225: return IMPORT; - case 35: + case 224: return IMPLEMENTS; - case 34: + case 223: return IF; - case 33: + case 222: return GOTO; - case 32: + case 221: return FOR; - case 31: + case 220: return FLOAT; - case 30: + case 219: return FINALLY; - case 29: + case 218: return FINAL; - case 28: + case 217: return FALSE; - case 27: + case 216: return EXTENDS; - case 26: + case 215: return ENUM; - case 25: + case 214: return ELSE; - case 24: + case 213: return DOUBLE; - case 23: + case 212: return DO; - case 22: + case 211: return _DEFAULT; - case 21: + case 210: return CONTINUE; - case 20: + case 209: return CONST; - case 19: + case 208: return CLASS; - case 18: + case 207: return CHAR; - case 17: + case 206: return CATCH; - case 16: + case 205: return CASE; - case 15: + case 204: return BYTE; - case 14: + case 203: return BREAK; - case 13: + case 202: return BOOLEAN; - case 12: + case 201: return ASSERT; - case 11: + case 200: return ABSTRACT; - case 10: + case 199: return COMMENT_CONTENT; - case 9: + case 198: + return JML_MULTI_LINE_COMMENT; + case 197: return MULTI_LINE_COMMENT; - case 8: + case 196: return JAVADOC_COMMENT; - case 7: + case 195: + return JML_BLOCK_COMMENT; + case 194: return ENTER_MULTILINE_COMMENT; - case 6: + case 193: + return ENTER_JML_BLOCK_COMMENT; + case 192: return ENTER_JAVADOC_COMMENT; - case 5: + case 191: + return JML_ENTER_MULTILINE_COMMENT; + case 190: return SINGLE_LINE_COMMENT; + case 189: + return JML_LINE_COMMENT; + case 188: + return DOTDOT; + case 187: + return WRITABLE; + case 186: + return WORKING_SPACE_REDUNDANTLY; + case 185: + return WORKING_SPACE; + case 184: + return WORKING_SPACE_ESC; + case 183: + return WHEN_REDUNDANTLY; + case 182: + return WARN_OP; + case 181: + return WARN; + case 180: + return UNREACHABLE; + case 179: + return UNKNOWN_OP_EQ; + case 178: + return UNKNOWN_OP; + case 177: + return UNINITIALIZED; + case 176: + return TYPE; + case 175: + return SUM; + case 174: + return SUCH_THAT; + case 173: + return SUBTYPE; + case 172: + return STRICTLY_PURE; + case 171: + return STATIC_INITIALIZER; + case 170: + return SPEC_SAFE_MATH; + case 169: + return SPEC_PUBLIC; + case 168: + return SPEC_PROTECTED; + case 167: + return SPEC_PRIVATE; + case 166: + return SPEC_PACKAGE; + case 165: + return SPEC_JAVA_MATH; + case 164: + return SPEC_BIGINT_MATH; + case 163: + return SIGNALS_REDUNDANTLY; + case 162: + return SIGNALS_ONLY_REDUNDANTLY; + case 161: + return SIGNALS_ONLY; + case 160: + return SIGNALS; + case 159: + return SET; + case 158: + return SAFE_MATH; + case 157: + return RETURN_BEHAVIOUR; + case 156: + return BACKARROW; + case 155: + return RETURN_BEHAVIOR; + case 154: + return RETURNS_REDUNDANTLY; + case 153: + return RETURNS; + case 152: + return RESULT; + case 151: + return REQUIRES_REDUNDANTLY; + case 150: + return REPRESENTS_REDUNDANTLY; + case 149: + return REPRESENTS; + case 148: + return REFINING; + case 147: + return READABLE; + case 146: + return PURE; + case 145: + return PRODUCT; + case 144: + return PRE_REDUNDANTLY; + case 143: + return PRE; + case 142: + return PRE_ESC; + case 141: + return POST_REDUNDANTLY; + case 140: + return POST; + case 139: + return OR; + case 138: + return OLD; + case 137: + return NUM_OF; + case 136: + return NULLABLE_BY_DEFAULT; + case 135: + return NULLABLE; + case 134: + return NOWARN_OP; + case 133: + return NOWARN; + case 132: + return NORMAL_EXAMPLE; + case 131: + return FEASIBLE_BEHAVIOUR; + case 130: + return FEASIBLE_BEHAVIOR; + case 129: + return NORMAL_BEHAVIOUR; + case 128: + return NORMAL_BEHAVIOR; + case 127: + return NON_NULL; + case 126: + return NONNULLELEMENTS; + case 125: + return NEW_OBJECT; + case 124: + return NESTED_CONTRACT_START; + case 123: + return NESTED_CONTRACT_END; + case 122: + return MONITORS_FOR; + case 121: + return MONITORED; + case 120: + return MODIFIES_REDUNDANTLY; + case 119: + return MODIFIES; + case 118: + return LOOP_MODIFIES; + case 117: + return MODIFIABLE_REDUNDANTLY; + case 116: + return MODIFIABLE; + case 115: + return MODEL_PROGRAM; + case 114: + return MODEL; + case 113: + return MIN; + case 112: + return METHOD; + case 111: + return MEASURED_BY_REDUNDANTLY; + case 110: + return ESC_MEASURED_BY; + case 109: + return MEASURED_BY; + case 108: + return MAX; + case 107: + return MAPS_REDUNDANTLY; + case 106: + return MAPS; + case 105: + return MAINTAINING_REDUNDANTLY; + case 104: + return MAINTAINING; + case 103: + return LOOP_INVARIANT_REDUNDANTLY; + case 102: + return LOOP_INVARIANT_FREE; + case 101: + return LOOP_INVARIANT; + case 100: + return LOOP_CONTRACT; + case 99: + return LBL; + case 98: + return LBLPOS; + case 97: + return LBLNEG; + case 96: + return JAVA_MATH; + case 95: + return IN_REDUNDANTLY; + case 94: + return INVARIANT_REDUNDANTLY; + case 93: + return NON_NULL_BY_DEFAULT; + case 92: + return NO_STATE; + case 91: + return TWO_STATE; + case 90: + return INSTANCE; + case 89: + return INITIALLY; + case 88: + return INITIALIZER; + case 87: + return IN; + case 86: + return IMPLIES_THAT; + case 85: + return HENCE_BY_REDUNDANTLY; + case 84: + return HENCE_BY; + case 83: + return HELPER; + case 82: + return END; + case 81: + return BEGIN; + case 80: + return GHOST; + case 79: + return READ_ONLY; + case 78: + return REP; + case 77: + return PEER; + case 76: + return FOR_EXAMPLE; + case 75: + return FORALL; + case 74: + return LET; + case 73: + return FORALLQ; + case 72: + return FIELD; + case 71: + return EXTRACT; + case 70: + return EXSURES_REDUNDANTLY; + case 69: + return EXSURES; + case 68: + return EXISTS; + case 67: + return EXCEPTIONAL_EXAMPLE; + case 66: + return EXCEPTIONAL_BEHAVIOUR; + case 65: + return EXCEPTIONAL_BEHAVIOR; + case 64: + return EXAMPLE; + case 63: + return ERASES; + case 62: + return IMPLICATION_BACKWARD; + case 61: + return IMPLICATION; + case 60: + return EQUIVALENCE; + case 59: + return REQUIRES_FREE; + case 58: + return ENSURES_FREE; + case 57: + return ENSURES_REDUNDANTLY; + case 56: + return ENSURES; + case 55: + return DURATION_REDUNDANTLY; + case 54: + return DURATION; + case 53: + return DIVERGES_REDUNDANTLY; + case 52: + return DIVERGES; + case 51: + return DETERMINES; + case 50: + return DECREASING_REDUNDANTLY; + case 49: + return DECREASING; + case 48: + return DECREASES_REDUNDANTLY; + case 47: + return DECREASES; + case 46: + return DECLASSIFIES; + case 45: + return CONTINUE_BEHAVIOUR; + case 44: + return CONTINUE_BEHAVIOR; + case 43: + return CONTINUES_REDUNDANTLY; + case 42: + return CONTINUES; + case 41: + return CONSTRUCTOR; + case 40: + return CONSTRAINT_REDUNDANTLY; + case 39: + return CONSTRAINT; + case 38: + return IMMUTABLE; + case 37: + return CODE_SAFE_MATH; + case 36: + return CODE_JAVA_MATH; + case 35: + return CODE_BIGINT_MATH; + case 34: + return CODE; + case 33: + return CHOOSE_IF; + case 32: + return CHOOSE; + case 31: + return CAPTURES_REDUNDANTLY; + case 30: + return CAPTURES; + case 29: + return CALLABLE_REDUNDANTLY; + case 28: + return CALLABLE; + case 27: + return BREAK_BEHAVIOUR; + case 26: + return BREAK_BEHAVIOR; + case 25: + return BREAKS_REDUNDANTLY; + case 24: + return BREAKS; + case 23: + return BIGINT_MATH; + case 22: + return BIGINT; + case 21: + return BEHAVIOUR; + case 20: + return BEHAVIOR; + case 19: + return AXIOM; + case 18: + return ASSUME_REDUNDANTLY; + case 17: + return ASSUME; + case 16: + return ASSIGNABLE_REDUNDANTLY; + case 15: + return ASSIGNABLE; + case 14: + return ASSERT_REDUNDANTLY; + case 13: + return ANTIVALENCE; + case 12: + return ALSO; + case 11: + return ACCESSIBLE_REDUNDANTLY; + case 10: + return ACCESSIBLE; + case 9: + return MODEL_BEHAVIOUR; + case 8: + return MODEL_BEHAVIOR; + case 7: + return ABRUPT_BEHAVIOUR; + case 6: + return ABRUPT_BEHAVIOR; + case 5: + return INVARIANT; case 4: return OLD_MAC_EOL; case 3: @@ -733,29 +1301,23 @@ public static Kind valueOf(int kind) { } } - public boolean isPrimitive() { - return this == BYTE - || this == CHAR - || this == SHORT - || this == INT - || this == LONG - || this == FLOAT - || this == DOUBLE; + public boolean isPrimitive() { + return this == BYTE || this == CHAR || this == SHORT || this == INT || this == LONG || this == FLOAT || this == DOUBLE; } - public int getKind() { + public int getKind() { return kind; } } - public JavaToken.Category getCategory() { + public JavaToken.Category getCategory() { return TokenTypes.getCategory(kind); } /** * Inserts newToken into the token list just before this token. */ - public void insert(JavaToken newToken) { + public void insert(JavaToken newToken) { assertNotNull(newToken); getPreviousToken().ifPresent(p -> { p.nextToken = newToken; @@ -768,7 +1330,7 @@ public void insert(JavaToken newToken) { /** * Inserts newToken into the token list just after this token. */ - public void insertAfter(JavaToken newToken) { + public void insertAfter(JavaToken newToken) { assertNotNull(newToken); getNextToken().ifPresent(n -> { n.previousToken = newToken; @@ -781,7 +1343,7 @@ public void insertAfter(JavaToken newToken) { /** * Links the tokens around the current token together, making the current token disappear from the list. */ - public void deleteToken() { + public void deleteToken() { final Optional nextToken = getNextToken(); final Optional previousToken = getPreviousToken(); previousToken.ifPresent(p -> p.nextToken = nextToken.orElse(null)); @@ -791,7 +1353,7 @@ public void deleteToken() { /** * Replaces the current token with newToken. */ - public void replaceToken(JavaToken newToken) { + public void replaceToken(JavaToken newToken) { assertNotNull(newToken); getPreviousToken().ifPresent(p -> { p.nextToken = newToken; @@ -806,7 +1368,7 @@ public void replaceToken(JavaToken newToken) { /** * @return the last token in the token list. */ - public JavaToken findLastToken() { + public JavaToken findLastToken() { JavaToken current = this; while (current.getNextToken().isPresent()) { current = current.getNextToken().get(); @@ -817,7 +1379,7 @@ public JavaToken findLastToken() { /** * @return the first token in the token list. */ - public JavaToken findFirstToken() { + public JavaToken findFirstToken() { JavaToken current = this; while (current.getPreviousToken().isPresent()) { current = current.getPreviousToken().get(); @@ -826,19 +1388,23 @@ public JavaToken findFirstToken() { } @Override - public int hashCode() { + public int hashCode() { int result = kind; result = 31 * result + text.hashCode(); return result; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; JavaToken javaToken = (JavaToken) o; - if (kind != javaToken.kind) return false; - if (!text.equals(javaToken.text)) return false; + if (kind != javaToken.kind) + return false; + if (!text.equals(javaToken.text)) + return false; return true; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java index f8826cd91e..a769d3c25c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java +++ b/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java @@ -21,7 +21,6 @@ package com.github.javaparser; import static com.github.javaparser.utils.Utils.*; - import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.javadoc.Javadoc; import com.github.javaparser.javadoc.JavadocBlockTag; @@ -49,31 +48,21 @@ public static Javadoc parse(JavadocComment comment) { public static Javadoc parse(String commentContent) { List cleanLines = cleanLines(normalizeEolInTextBlock(commentContent, LineSeparator.SYSTEM)); - int indexOfFirstBlockTag = cleanLines.stream() - .filter(JavadocParser::isABlockLine) - .map(cleanLines::indexOf) - .findFirst() - .orElse(-1); + int indexOfFirstBlockTag = cleanLines.stream().filter(JavadocParser::isABlockLine).map(cleanLines::indexOf).findFirst().orElse(-1); List blockLines; String descriptionText; if (indexOfFirstBlockTag == -1) { descriptionText = trimRight(String.join(LineSeparator.SYSTEM.asRawString(), cleanLines)); blockLines = Collections.emptyList(); } else { - descriptionText = trimRight( - String.join(LineSeparator.SYSTEM.asRawString(), cleanLines.subList(0, indexOfFirstBlockTag))); + descriptionText = trimRight(String.join(LineSeparator.SYSTEM.asRawString(), cleanLines.subList(0, indexOfFirstBlockTag))); // Combine cleaned lines, but only starting with the first block tag till the end // In this combined string it is easier to handle multiple lines which actually belong together - String tagBlock = cleanLines.subList(indexOfFirstBlockTag, cleanLines.size()).stream() - .collect(Collectors.joining(LineSeparator.SYSTEM.asRawString())); + String tagBlock = cleanLines.subList(indexOfFirstBlockTag, cleanLines.size()).stream().collect(Collectors.joining(LineSeparator.SYSTEM.asRawString())); // Split up the entire tag back again, considering now that some lines belong to the same block tag. // The pattern splits the block at each new line starting with the '@' symbol, thus the symbol // then needs to be added again so that the block parsers handles everything correctly. - blockLines = BLOCK_PATTERN - .splitAsStream(tagBlock) - .filter(s1 -> !s1.isEmpty()) - .map(s -> BLOCK_TAG_PREFIX + s) - .collect(Collectors.toList()); + blockLines = BLOCK_PATTERN.splitAsStream(tagBlock).filter(s1 -> !s1.isEmpty()).map(s -> BLOCK_TAG_PREFIX + s).collect(Collectors.toList()); } Javadoc document = new Javadoc(JavadocDescription.parseText(descriptionText)); blockLines.forEach(l -> document.addBlockTag(parseBlockTag(l))); @@ -103,35 +92,30 @@ private static List cleanLines(String content) { if (lines.length == 0) { return Collections.emptyList(); } - List cleanedLines = Arrays.stream(lines) - .map(l -> { - int asteriskIndex = startsWithAsterisk(l); - if (asteriskIndex == -1) { - return l; - } - if (l.length() > (asteriskIndex + 1)) { - char c = l.charAt(asteriskIndex + 1); - if (c == ' ' || c == '\t') { - return l.substring(asteriskIndex + 2); - } - } - return l.substring(asteriskIndex + 1); - }) - .collect(Collectors.toList()); + List cleanedLines = Arrays.stream(lines).map(l -> { + int asteriskIndex = startsWithAsterisk(l); + if (asteriskIndex == -1) { + return l; + } + if (l.length() > (asteriskIndex + 1)) { + char c = l.charAt(asteriskIndex + 1); + if (c == ' ' || c == '\t') { + return l.substring(asteriskIndex + 2); + } + } + return l.substring(asteriskIndex + 1); + }).collect(Collectors.toList()); // lines containing only whitespace are normalized to empty lines - cleanedLines = - cleanedLines.stream().map(l -> l.trim().isEmpty() ? "" : l).collect(Collectors.toList()); + cleanedLines = cleanedLines.stream().map(l -> l.trim().isEmpty() ? "" : l).collect(Collectors.toList()); // if the first starts with a space, remove it - if (!cleanedLines.get(0).isEmpty() - && (cleanedLines.get(0).charAt(0) == ' ' || cleanedLines.get(0).charAt(0) == '\t')) { + if (!cleanedLines.get(0).isEmpty() && (cleanedLines.get(0).charAt(0) == ' ' || cleanedLines.get(0).charAt(0) == '\t')) { cleanedLines.set(0, cleanedLines.get(0).substring(1)); } // drop empty lines at the beginning and at the end while (cleanedLines.size() > 0 && cleanedLines.get(0).trim().isEmpty()) { cleanedLines = cleanedLines.subList(1, cleanedLines.size()); } - while (cleanedLines.size() > 0 - && cleanedLines.get(cleanedLines.size() - 1).trim().isEmpty()) { + while (cleanedLines.size() > 0 && cleanedLines.get(cleanedLines.size() - 1).trim().isEmpty()) { cleanedLines = cleanedLines.subList(0, cleanedLines.size() - 1); } return cleanedLines; diff --git a/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java b/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java index f74fa8f62b..95716c4e5f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java +++ b/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java @@ -29,7 +29,7 @@ /** * {@link Provider} un-escaping unicode escape sequences in the input sequence. */ -public class LineEndingProcessingProvider implements Provider { +public class LineEndingProcessingProvider implements Provider { private static final int EOF = -1; @@ -57,17 +57,17 @@ public class LineEndingProcessingProvider implements Provider { private final Map eolCounts = new HashMap<>(); - public LineEndingProcessingProvider(Provider input) { + public LineEndingProcessingProvider(Provider input) { this(DEFAULT_BUFFER_SIZE, input); } - public LineEndingProcessingProvider(int bufferSize, Provider input) { + public LineEndingProcessingProvider(int bufferSize, Provider input) { _input = input; _data = new char[bufferSize]; } @Override - public void close() throws IOException { + public void close() throws IOException { _input.close(); } @@ -80,11 +80,8 @@ private int fillBuffer() throws IOException { return direct; } - public LineSeparator getDetectedLineEnding() { - return LineSeparator.getLineEnding( - eolCounts.getOrDefault(LineSeparator.CR, 0), - eolCounts.getOrDefault(LineSeparator.LF, 0), - eolCounts.getOrDefault(LineSeparator.CRLF, 0)); + public LineSeparator getDetectedLineEnding() { + return LineSeparator.getLineEnding(eolCounts.getOrDefault(LineSeparator.CR, 0), eolCounts.getOrDefault(LineSeparator.LF, 0), eolCounts.getOrDefault(LineSeparator.CRLF, 0)); } private boolean isBufferEmpty() { @@ -107,7 +104,7 @@ private int nextBufferedChar() throws IOException { } @Override - public int read(char[] buffer, final int offset, int len) throws IOException { + public int read(char[] buffer, final int offset, int len) throws IOException { int pos = offset; int stop = offset + len; LineSeparator previousLineSeparator = null; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java b/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java index d74bc298c8..b6450ae64e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java @@ -22,26 +22,25 @@ import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.Collections.singletonList; - import com.github.javaparser.utils.LineSeparator; import java.util.List; /** * Thrown when parsing problems occur during parsing with the static methods on JavaParser. */ -public class ParseProblemException extends RuntimeException { +public class ParseProblemException extends RuntimeException { /** * The problems that were encountered during parsing */ private final List problems; - public ParseProblemException(List problems) { + public ParseProblemException(List problems) { super(createMessage(assertNotNull(problems))); this.problems = problems; } - public ParseProblemException(Throwable throwable) { + public ParseProblemException(Throwable throwable) { this(singletonList(new Problem(throwable.getMessage(), null, throwable))); } @@ -53,7 +52,7 @@ private static String createMessage(List problems) { return message.toString(); } - public List getProblems() { + public List getProblems() { return problems; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java b/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java index 1b09290667..dc9da54a45 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java @@ -29,7 +29,7 @@ /** * The results given when parsing with an instance of JavaParser. */ -public class ParseResult { +public class ParseResult { private final T result; @@ -43,7 +43,7 @@ public class ParseResult { * @param result the AST, or empty if it wasn't created. * @param problems a list of encountered parsing problems. */ - public ParseResult(T result, List problems, CommentsCollection commentsCollection) { + public ParseResult(T result, List problems, CommentsCollection commentsCollection) { this.commentsCollection = commentsCollection; this.result = result; this.problems = problems; @@ -52,14 +52,14 @@ public ParseResult(T result, List problems, CommentsCollection comments /** * @return if parsing was successful, meaning no errors of any kind were encountered. */ - public boolean isSuccessful() { + public boolean isSuccessful() { return problems.isEmpty() && result != null; } /** * Calls the consumer with the result if parsing was succesful. */ - public void ifSuccessful(Consumer consumer) { + public void ifSuccessful(Consumer consumer) { if (isSuccessful()) { consumer.accept(result); } @@ -68,33 +68,33 @@ public void ifSuccessful(Consumer consumer) { /** * @return the list of encountered parsing problems. Empty when no problems were encountered. */ - public List getProblems() { + public List getProblems() { return problems; } /** * @return the {@code i}'th encountered parsing problem. May throw IndexOutOfBoundsException. */ - public Problem getProblem(int i) { + public Problem getProblem(int i) { return getProblems().get(i); } /** * @return the complete collection of comments encountered while parsing. */ - public Optional getCommentsCollection() { + public Optional getCommentsCollection() { return Optional.ofNullable(commentsCollection); } /** * @return the AST of the parsed source code, or empty if parsing failed completely. */ - public Optional getResult() { + public Optional getResult() { return Optional.ofNullable(result); } @Override - public String toString() { + public String toString() { if (isSuccessful()) { return "Parsing successful"; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java b/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java index 66f4bda5af..1bc06aff7a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java @@ -47,7 +47,7 @@ * @see JavaParser#parse(ParseStart, Provider) */ @FunctionalInterface -public interface ParseStart { +public interface ParseStart { ParseStart COMPILATION_UNIT = GeneratedJavaParser::CompilationUnit; @@ -71,11 +71,9 @@ public interface ParseStart { ParseStart TYPE_PARAMETER = GeneratedJavaParser::TypeParameterParseStart; - ParseStart VARIABLE_DECLARATION_EXPR = - GeneratedJavaParser::VariableDeclarationExpressionParseStart; + ParseStart VARIABLE_DECLARATION_EXPR = GeneratedJavaParser::VariableDeclarationExpressionParseStart; - ParseStart EXPLICIT_CONSTRUCTOR_INVOCATION_STMT = - GeneratedJavaParser::ExplicitConstructorInvocationParseStart; + ParseStart EXPLICIT_CONSTRUCTOR_INVOCATION_STMT = GeneratedJavaParser::ExplicitConstructorInvocationParseStart; ParseStart NAME = GeneratedJavaParser::NameParseStart; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java index 0186384f83..74eb7426af 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java @@ -21,7 +21,6 @@ package com.github.javaparser; import static com.github.javaparser.ParserConfiguration.LanguageLevel.POPULAR; - import com.github.javaparser.UnicodeEscapeProcessingProvider.PositionMapping; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; @@ -29,6 +28,7 @@ import com.github.javaparser.ast.validator.Validator; import com.github.javaparser.ast.validator.language_level_validations.*; import com.github.javaparser.ast.validator.postprocessors.*; +import com.github.javaparser.jml.JmlProcessor; import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; import com.github.javaparser.resolution.SymbolResolver; import com.github.javaparser.utils.LineSeparator; @@ -44,9 +44,47 @@ * Note that this can be changed even when reusing the same JavaParser instance. * It will pick up the changes. */ -public class ParserConfiguration { +public class ParserConfiguration { + + //region jmlparser + private List> jmlKeys = new ArrayList<>(); + + { + jmlKeys.add(new ArrayList<>()); + } + + public List> getJmlKeys() { + return jmlKeys; + } + + public void setJmlKeys(List> jmlKeys) { + this.jmlKeys = jmlKeys; + } + + private boolean keepJmlDocs = false; + + public ParserConfiguration setKeepJmlDocs(boolean flag) { + this.keepJmlDocs = flag; + return this; + } + + public boolean isKeepJmlDocs() { + return this.keepJmlDocs; + } - public enum LanguageLevel { + private boolean preprocessJml = false; + + public ParserConfiguration setProcessJml(boolean jml) { + this.preprocessJml = jml; + return this; + } + + public boolean isProcessJml() { + return this.preprocessJml; + } + + //endregion + public enum LanguageLevel { /** * Java 1.0 @@ -207,29 +245,14 @@ public enum LanguageLevel { final PostProcessors postProcessor; - private static final LanguageLevel[] yieldSupport = new LanguageLevel[] { - JAVA_13, - JAVA_13_PREVIEW, - JAVA_14, - JAVA_14_PREVIEW, - JAVA_15, - JAVA_15_PREVIEW, - JAVA_16, - JAVA_16_PREVIEW, - JAVA_17, - JAVA_17_PREVIEW, - JAVA_18, - JAVA_19, - JAVA_20, - JAVA_21 - }; + private static final LanguageLevel[] yieldSupport = new LanguageLevel[] { JAVA_13, JAVA_13_PREVIEW, JAVA_14, JAVA_14_PREVIEW, JAVA_15, JAVA_15_PREVIEW, JAVA_16, JAVA_16_PREVIEW, JAVA_17, JAVA_17_PREVIEW, JAVA_18, JAVA_19, JAVA_20, JAVA_21 }; LanguageLevel(Validator validator, PostProcessors postProcessor) { this.validator = validator; this.postProcessor = postProcessor; } - public boolean isYieldSupported() { + public boolean isYieldSupported() { return Arrays.stream(yieldSupport).anyMatch(level -> level == this); } } @@ -264,7 +287,7 @@ private class UnicodeEscapeProcessor extends Processor { private UnicodeEscapeProcessingProvider _unicodeDecoder; @Override - public Provider preProcess(Provider innerProvider) { + public Provider preProcess(Provider innerProvider) { if (isPreprocessUnicodeEscapes()) { _unicodeDecoder = new UnicodeEscapeProcessingProvider(innerProvider); return _unicodeDecoder; @@ -273,7 +296,7 @@ public Provider preProcess(Provider innerProvider) { } @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (isPreprocessUnicodeEscapes()) { result.getResult().ifPresent(root -> { PositionMapping mapping = _unicodeDecoder.getPositionMapping(); @@ -290,7 +313,7 @@ private class LineEndingProcessor extends Processor { private LineEndingProcessingProvider _lineEndingProcessingProvider; @Override - public Provider preProcess(Provider innerProvider) { + public Provider preProcess(Provider innerProvider) { if (isDetectOriginalLineSeparator()) { _lineEndingProcessingProvider = new LineEndingProcessingProvider(innerProvider); return _lineEndingProcessingProvider; @@ -299,7 +322,7 @@ public Provider preProcess(Provider innerProvider) { } @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (isDetectOriginalLineSeparator()) { result.getResult().ifPresent(rootNode -> { LineSeparator detectedLineSeparator = _lineEndingProcessingProvider.getDetectedLineEnding(); @@ -313,33 +336,31 @@ public void postProcess(ParseResult result, ParserConfiguration } } - public ParserConfiguration() { + public ParserConfiguration() { processors.add(() -> ParserConfiguration.this.new UnicodeEscapeProcessor()); processors.add(() -> ParserConfiguration.this.new LineEndingProcessor()); processors.add(() -> new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (configuration.isAttributeComments()) { - result.ifSuccessful(resultNode -> result.getCommentsCollection() - .ifPresent(comments -> new CommentsInserter(configuration) - .insertComments(resultNode, comments.copy().getComments()))); + result.ifSuccessful(resultNode -> result.getCommentsCollection().ifPresent(comments -> new CommentsInserter(configuration).insertComments(resultNode, comments.copy().getComments()))); } } }); + JmlProcessor jmlProcessor = new JmlProcessor(); + processors.add(() -> jmlProcessor); processors.add(() -> new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { LanguageLevel languageLevel = getLanguageLevel(); if (languageLevel != null) { if (languageLevel.postProcessor != null) { languageLevel.postProcessor.postProcess(result, configuration); } if (languageLevel.validator != null) { - languageLevel.validator.accept( - result.getResult().get(), new ProblemReporter(newProblem -> result.getProblems() - .add(newProblem))); + languageLevel.validator.accept(result.getResult().get(), new ProblemReporter(newProblem -> result.getProblems().add(newProblem))); } } } @@ -347,20 +368,18 @@ public void postProcess(ParseResult result, ParserConfiguration processors.add(() -> new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { - configuration - .getSymbolResolver() - .ifPresent(symbolResolver -> result.ifSuccessful(resultNode -> { - if (resultNode instanceof CompilationUnit) { - resultNode.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver); - } - })); + public void postProcess(ParseResult result, ParserConfiguration configuration) { + configuration.getSymbolResolver().ifPresent(symbolResolver -> result.ifSuccessful(resultNode -> { + if (resultNode instanceof CompilationUnit) { + resultNode.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver); + } + })); } }); processors.add(() -> new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (configuration.isLexicalPreservationEnabled()) { result.ifSuccessful(LexicalPreservingPrinter::setup); } @@ -368,7 +387,7 @@ public void postProcess(ParseResult result, ParserConfiguration }); } - public boolean isAttributeComments() { + public boolean isAttributeComments() { return attributeComments; } @@ -376,32 +395,30 @@ public boolean isAttributeComments() { * Whether to run CommentsInserter, which will put the comments that were found in the source code into the comment * and javadoc fields of the nodes it thinks they refer to. */ - public ParserConfiguration setAttributeComments(boolean attributeComments) { + public ParserConfiguration setAttributeComments(boolean attributeComments) { this.attributeComments = attributeComments; return this; } - public boolean isDoNotAssignCommentsPrecedingEmptyLines() { + public boolean isDoNotAssignCommentsPrecedingEmptyLines() { return doNotAssignCommentsPrecedingEmptyLines; } - public ParserConfiguration setDoNotAssignCommentsPrecedingEmptyLines( - boolean doNotAssignCommentsPrecedingEmptyLines) { + public ParserConfiguration setDoNotAssignCommentsPrecedingEmptyLines(boolean doNotAssignCommentsPrecedingEmptyLines) { this.doNotAssignCommentsPrecedingEmptyLines = doNotAssignCommentsPrecedingEmptyLines; return this; } - public boolean isIgnoreAnnotationsWhenAttributingComments() { + public boolean isIgnoreAnnotationsWhenAttributingComments() { return ignoreAnnotationsWhenAttributingComments; } - public ParserConfiguration setIgnoreAnnotationsWhenAttributingComments( - boolean ignoreAnnotationsWhenAttributingComments) { + public ParserConfiguration setIgnoreAnnotationsWhenAttributingComments(boolean ignoreAnnotationsWhenAttributingComments) { this.ignoreAnnotationsWhenAttributingComments = ignoreAnnotationsWhenAttributingComments; return this; } - public ParserConfiguration setStoreTokens(boolean storeTokens) { + public ParserConfiguration setStoreTokens(boolean storeTokens) { this.storeTokens = storeTokens; if (!storeTokens) { setAttributeComments(false); @@ -409,11 +426,11 @@ public ParserConfiguration setStoreTokens(boolean storeTokens) { return this; } - public boolean isStoreTokens() { + public boolean isStoreTokens() { return storeTokens; } - public int getTabSize() { + public int getTabSize() { return tabSize; } @@ -421,7 +438,7 @@ public int getTabSize() { * When a TAB character is encountered during parsing, the column position will be increased by this value. * By default it is 1. */ - public ParserConfiguration setTabSize(int tabSize) { + public ParserConfiguration setTabSize(int tabSize) { this.tabSize = tabSize; return this; } @@ -431,40 +448,40 @@ public ParserConfiguration setTabSize(int tabSize) { * When this is enabled, LexicalPreservingPrinter.print can be used to reproduce * the original formatting of the file. */ - public ParserConfiguration setLexicalPreservationEnabled(boolean lexicalPreservationEnabled) { + public ParserConfiguration setLexicalPreservationEnabled(boolean lexicalPreservationEnabled) { this.lexicalPreservationEnabled = lexicalPreservationEnabled; return this; } - public boolean isLexicalPreservationEnabled() { + public boolean isLexicalPreservationEnabled() { return lexicalPreservationEnabled; } /** * Retrieve the SymbolResolver to be used while parsing, if any. */ - public Optional getSymbolResolver() { + public Optional getSymbolResolver() { return Optional.ofNullable(symbolResolver); } /** * Set the SymbolResolver to be injected while parsing. */ - public ParserConfiguration setSymbolResolver(SymbolResolver symbolResolver) { + public ParserConfiguration setSymbolResolver(SymbolResolver symbolResolver) { this.symbolResolver = symbolResolver; return this; } - public List> getProcessors() { + public List> getProcessors() { return processors; } - public ParserConfiguration setLanguageLevel(LanguageLevel languageLevel) { + public ParserConfiguration setLanguageLevel(LanguageLevel languageLevel) { this.languageLevel = languageLevel; return this; } - public LanguageLevel getLanguageLevel() { + public LanguageLevel getLanguageLevel() { return languageLevel; } @@ -475,33 +492,45 @@ public LanguageLevel getLanguageLevel() { * positions in the AST will point to the original input, which is exactly the same as without this option. * Without this option enabled, the unicode escapes will not be processed and are transfered intact to the AST. */ - public ParserConfiguration setPreprocessUnicodeEscapes(boolean preprocessUnicodeEscapes) { + public ParserConfiguration setPreprocessUnicodeEscapes(boolean preprocessUnicodeEscapes) { this.preprocessUnicodeEscapes = preprocessUnicodeEscapes; return this; } - public boolean isPreprocessUnicodeEscapes() { + public boolean isPreprocessUnicodeEscapes() { return preprocessUnicodeEscapes; } - public ParserConfiguration setDetectOriginalLineSeparator(boolean detectOriginalLineSeparator) { + public ParserConfiguration setDetectOriginalLineSeparator(boolean detectOriginalLineSeparator) { this.detectOriginalLineSeparator = detectOriginalLineSeparator; return this; } - public boolean isDetectOriginalLineSeparator() { + public boolean isDetectOriginalLineSeparator() { return detectOriginalLineSeparator; } - public Charset getCharacterEncoding() { + public Charset getCharacterEncoding() { return characterEncoding; } /** * The character encoding used for reading input from files and streams. By default UTF8 is used. */ - public ParserConfiguration setCharacterEncoding(Charset characterEncoding) { + public ParserConfiguration setCharacterEncoding(Charset characterEncoding) { this.characterEncoding = characterEncoding; return this; } + + //region weigl + public ParserConfiguration addProcessor(Processor processor) { + processors.add(() -> processor); + return this; + } + + public ParserConfiguration addProcessor(int pos, Processor processor) { + processors.add(pos, () -> processor); + return this; + } + //endregion } diff --git a/javaparser-core/src/main/java/com/github/javaparser/Position.java b/javaparser-core/src/main/java/com/github/javaparser/Position.java index 1b35386b83..972773ecaa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/Position.java +++ b/javaparser-core/src/main/java/com/github/javaparser/Position.java @@ -26,7 +26,7 @@ /** * A position in a source file. Lines and columns start counting at 1. */ -public class Position implements Comparable { +public class Position implements Comparable { public final int line; @@ -58,7 +58,7 @@ public class Position implements Comparable { * TODO: Do we refer to the characters as columns, * ...or the spaces between (thus also before/after) characters as columns? */ - public Position(int line, int column) { + public Position(int line, int column) { if (line < Position.ABSOLUTE_END_LINE) { throw new IllegalArgumentException("Can't position at line " + line); } @@ -86,28 +86,28 @@ public static Position pos(int line, int column) { /** * @return Jump to the given column number, while retaining the current line number. */ - public Position withColumn(int column) { + public Position withColumn(int column) { return new Position(this.line, column); } /** * @return Jump to the given line number, while retaining the current column number. */ - public Position withLine(int line) { + public Position withLine(int line) { return new Position(line, this.column); } /** * @return a position that is "characters" characters more to the right than this position. */ - public Position right(int characters) { + public Position right(int characters) { return new Position(line, this.column + characters); } /** * @return a position that is on the start of the next line from this position. */ - public Position nextLine() { + public Position nextLine() { return new Position(line + 1, FIRST_COLUMN); } @@ -118,7 +118,7 @@ public Position nextLine() { * * @return true if the position is usable or a special position. */ - public boolean valid() { + public boolean valid() { return ABSOLUTE_END_LINE == line || ABSOLUTE_BEGIN_LINE == line || line >= FIRST_LINE && column >= FIRST_COLUMN; } @@ -126,7 +126,7 @@ public boolean valid() { * @return The inverse of {@link #valid()} * @see #valid() */ - public boolean invalid() { + public boolean invalid() { return !valid(); } @@ -135,7 +135,7 @@ public boolean invalid() { * Otherwise, if the alternativePosition is valid, return that. * Otherwise, just return this. */ - public Position orIfInvalid(Position alternativePosition) { + public Position orIfInvalid(Position alternativePosition) { assertNotNull(alternativePosition); if (this.valid()) { return this; @@ -147,7 +147,7 @@ public Position orIfInvalid(Position alternativePosition) { * @param otherPosition the other position to compare to * @return true if this position is after the given position */ - public boolean isAfter(Position otherPosition) { + public boolean isAfter(Position otherPosition) { assertNotNull(otherPosition); if (line == otherPosition.line) { return column > otherPosition.column; @@ -155,7 +155,7 @@ public boolean isAfter(Position otherPosition) { return line > otherPosition.line || otherPosition.line == Position.ABSOLUTE_BEGIN_LINE; } - public boolean isAfterOrEqual(Position otherPosition) { + public boolean isAfterOrEqual(Position otherPosition) { return isAfter(otherPosition) || equals(otherPosition); } @@ -163,7 +163,7 @@ public boolean isAfterOrEqual(Position otherPosition) { * @param otherPosition the other position to compare to * @return true if this position is before the given position */ - public boolean isBefore(Position otherPosition) { + public boolean isBefore(Position otherPosition) { assertNotNull(otherPosition); if (line == otherPosition.line) { return column < otherPosition.column; @@ -171,12 +171,12 @@ public boolean isBefore(Position otherPosition) { return line < otherPosition.line || otherPosition.line == Position.ABSOLUTE_END_LINE; } - public boolean isBeforeOrEqual(Position otherPosition) { + public boolean isBeforeOrEqual(Position otherPosition) { return isBefore(otherPosition) || equals(otherPosition); } @Override - public int compareTo(Position otherPosition) { + public int compareTo(Position otherPosition) { assertNotNull(otherPosition); if (isBefore(otherPosition)) { return -1; @@ -188,20 +188,22 @@ public int compareTo(Position otherPosition) { } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Position otherPosition = (Position) o; return Objects.equals(line, otherPosition.line) && Objects.equals(column, otherPosition.column); } @Override - public int hashCode() { + public int hashCode() { return Objects.hash(line, column); } @Override - public String toString() { + public String toString() { return "(line " + line + ",col " + column + ")"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/Problem.java b/javaparser-core/src/main/java/com/github/javaparser/Problem.java index 4fa2f99253..3d73770484 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/Problem.java +++ b/javaparser-core/src/main/java/com/github/javaparser/Problem.java @@ -21,7 +21,6 @@ package com.github.javaparser; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.utils.LineSeparator; import java.util.Comparator; import java.util.Optional; @@ -29,7 +28,7 @@ /** * A problem that was encountered during parsing. */ -public class Problem { +public class Problem { private final String message; @@ -37,7 +36,7 @@ public class Problem { private final Throwable cause; - public Problem(String message, TokenRange location, Throwable cause) { + public Problem(String message, TokenRange location, Throwable cause) { assertNotNull(message); this.message = message; this.location = location; @@ -45,14 +44,15 @@ public Problem(String message, TokenRange location, Throwable cause) { } @Override - public String toString() { + public String toString() { final StringBuilder str = new StringBuilder(getVerboseMessage()); if (cause != null) { str.append(LineSeparator.SYSTEM).append("Problem stacktrace : ").append(LineSeparator.SYSTEM); for (int i = 0; i < cause.getStackTrace().length; i++) { StackTraceElement ste = cause.getStackTrace()[i]; str.append(" ").append(ste.toString()); - if (i + 1 != cause.getStackTrace().length) str.append(LineSeparator.SYSTEM); + if (i + 1 != cause.getStackTrace().length) + str.append(LineSeparator.SYSTEM); } } return str.toString(); @@ -61,30 +61,28 @@ public String toString() { /** * @return the message that was passed into the constructor. */ - public String getMessage() { + public String getMessage() { return message; } /** * @return the message plus location information. */ - public String getVerboseMessage() { - return getLocation() - .map(l -> l.getBegin().getRange().map(r -> r.begin.toString()).orElse("(line ?,col ?)") + " " + message) - .orElse(message); + public String getVerboseMessage() { + return getLocation().map(l -> l.getBegin().getRange().map(r -> r.begin.toString()).orElse("(line ?,col ?)") + " " + message).orElse(message); } /** * @return the location that was passed into the constructor. */ - public Optional getLocation() { + public Optional getLocation() { return Optional.ofNullable(location); } /** * @return the cause that was passed into the constructor. */ - public Optional getCause() { + public Optional getCause() { return Optional.ofNullable(cause); } @@ -92,10 +90,8 @@ public Optional getCause() { * Sorts problems on position. */ public static Comparator PROBLEM_BY_BEGIN_POSITION = (a, b) -> { - final Optional aBegin = - a.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin)); - final Optional bBegin = - b.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin)); + final Optional aBegin = a.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin)); + final Optional bBegin = b.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin)); if (aBegin.isPresent() && bBegin.isPresent()) { return aBegin.get().compareTo(bBegin.get()); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/Processor.java b/javaparser-core/src/main/java/com/github/javaparser/Processor.java index 9394b5eccf..c7c3d5022c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/Processor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/Processor.java @@ -21,17 +21,18 @@ import com.github.javaparser.ast.Node; -public class Processor { +public class Processor { /** * Makes the parser do a post-parsing step before the result is returned to the user. */ - public void postProcess(ParseResult result, ParserConfiguration configuration) {} + public void postProcess(ParseResult result, ParserConfiguration configuration) { + } /** * Adds a pre-parsing step, which has access to the sourcecode through the innerProvider. */ - public Provider preProcess(Provider innerProvider) { + public Provider preProcess(Provider innerProvider) { return innerProvider; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/Providers.java b/javaparser-core/src/main/java/com/github/javaparser/Providers.java index 1ad8d0a4e0..3c380db7a3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/Providers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/Providers.java @@ -21,7 +21,6 @@ package com.github.javaparser; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.io.*; import java.nio.charset.Charset; import java.nio.file.Files; @@ -35,7 +34,8 @@ public final class Providers { public static final Charset UTF8 = Charset.forName("utf-8"); - private Providers() {} + private Providers() { + } public static Provider provider(Reader reader) { return new StreamProvider(assertNotNull(reader)); @@ -81,8 +81,7 @@ public static Provider provider(String source) { * Provide a Provider from the resource found in class loader with the provided encoding.
As resource is * accessed through a class loader, a leading "/" is not allowed in pathToResource */ - public static Provider resourceProvider(ClassLoader classLoader, String pathToResource, Charset encoding) - throws IOException { + public static Provider resourceProvider(ClassLoader classLoader, String pathToResource, Charset encoding) throws IOException { InputStream resourceAsStream = classLoader.getResourceAsStream(pathToResource); if (resourceAsStream == null) { throw new IOException("Cannot find " + pathToResource); diff --git a/javaparser-core/src/main/java/com/github/javaparser/Range.java b/javaparser-core/src/main/java/com/github/javaparser/Range.java index 77f02a8410..aa1ac8a011 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/Range.java +++ b/javaparser-core/src/main/java/com/github/javaparser/Range.java @@ -23,7 +23,7 @@ /** * A range of characters in a source file, from "begin" to "end", including the characters at "begin" and "end". */ -public class Range { +public class Range { public final Position begin; @@ -38,7 +38,7 @@ public class Range { * @param begin The starting position of the range. * @param end The end position of the range. */ - public Range(Position begin, Position end) { + public Range(Position begin, Position end) { if (begin == null) { throw new IllegalArgumentException("begin can't be null"); } @@ -85,7 +85,7 @@ public static Range range(int beginLine, int beginColumn, int endLine, int endCo * Valid values are per the constructor of{@link Position}. * @return A copy of this `Range` object, but with the begin column number replaced with the given column number. */ - public Range withBeginColumn(int beginColumn) { + public Range withBeginColumn(int beginColumn) { return range(begin.withColumn(beginColumn), end); } @@ -94,7 +94,7 @@ public Range withBeginColumn(int beginColumn) { * Valid values are per the constructor of{@link Position}. * @return A copy of this `Range` object, but with the begin line number replaced with the given line number. */ - public Range withBeginLine(int beginLine) { + public Range withBeginLine(int beginLine) { return range(begin.withLine(beginLine), end); } @@ -103,7 +103,7 @@ public Range withBeginLine(int beginLine) { * Valid values are per the constructor of{@link Position}. * @return A copy of this `Range` object, but with the end column number replaced with the given line column. */ - public Range withEndColumn(int endColumn) { + public Range withEndColumn(int endColumn) { return range(begin, end.withColumn(endColumn)); } @@ -112,7 +112,7 @@ public Range withEndColumn(int endColumn) { * Valid values are per the constructor of{@link Position}. * @return A copy of this `Range` object, but with the end line number replaced with the given line number. */ - public Range withEndLine(int endLine) { + public Range withEndLine(int endLine) { return range(begin, end.withLine(endLine)); } @@ -120,7 +120,7 @@ public Range withEndLine(int endLine) { * @param begin The value used to replace the current begin position. * @return A copy of this `Range` object, but with the begin position replaced with the given position. */ - public Range withBegin(Position begin) { + public Range withBegin(Position begin) { return range(begin, this.end); } @@ -128,7 +128,7 @@ public Range withBegin(Position begin) { * @param end The value used to replace the current end position. * @return A copy of this `Range` object, but with the end position replaced with the given position. */ - public Range withEnd(Position end) { + public Range withEnd(Position end) { return range(this.begin, end); } @@ -138,7 +138,7 @@ public Range withEnd(Position end) { * As {@link #strictlyContains(Range)}, but also allow ranges which have an equal start and/or end position. * In these cases, the `other` range is not strictly "inside" of this range. */ - public boolean contains(Range other) { + public boolean contains(Range other) { boolean beginResult = (begin.isBeforeOrEqual(other.begin)); if (!beginResult) return false; @@ -153,7 +153,7 @@ public boolean contains(Range other) { * For example, if the given position is equal to the start or end position of this range. * In these cases, the `other` range is not strictly "inside" of this range. */ - public boolean contains(Position position) { + public boolean contains(Position position) { return strictlyContains(position) || begin.equals(position) || end.equals(position); } @@ -162,7 +162,7 @@ public boolean contains(Position position) { *

* It means that this has to be larger than other and it has to start before other and end after other. */ - public boolean strictlyContains(Range other) { + public boolean strictlyContains(Range other) { boolean beginResult = (begin.isBefore(other.begin)); boolean endResult = (end.isAfter(other.end)); return beginResult && endResult; @@ -173,7 +173,7 @@ public boolean strictlyContains(Range other) { *

* It means that the position is after the begin of this range and before the end of this range. */ - public boolean strictlyContains(Position position) { + public boolean strictlyContains(Position position) { return position.isAfter(begin) && position.isBefore(end); } @@ -190,7 +190,7 @@ public boolean strictlyContains(Position position) { * Range 1: ABC * Range 2: CDE */ - public boolean overlapsWith(Range other) { + public boolean overlapsWith(Range other) { return (contains(other.begin) || contains(other.end)) || (other.contains(begin) || other.contains(end)); } @@ -198,7 +198,7 @@ public boolean overlapsWith(Range other) { * @param position The position to compare against. * @return True if the end of this range is before (but not equal to) the given position to compare against. */ - public boolean isBefore(Position position) { + public boolean isBefore(Position position) { return end.isBefore(position); } @@ -206,7 +206,7 @@ public boolean isBefore(Position position) { * @param other The range to compare against. * @return True if the end of this range is before (but not equal to) the given position to compare against. */ - public boolean isBefore(Range other) { + public boolean isBefore(Range other) { return end.isBefore(other.begin); } @@ -214,7 +214,7 @@ public boolean isBefore(Range other) { * @param position The position to compare against. * @return True if the start of this range is after (but not equal to) the given position to compare against. */ - public boolean isAfter(Position position) { + public boolean isAfter(Position position) { return begin.isAfter(position); } @@ -222,25 +222,27 @@ public boolean isAfter(Position position) { * @param other The range to compare against. * @return True if the start of this range is after (but not equal to) the given position to compare against. */ - public boolean isAfter(Range other) { + public boolean isAfter(Range other) { return begin.isAfter(other.end); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Range range = (Range) o; return begin.equals(range.begin) && end.equals(range.end); } @Override - public int hashCode() { + public int hashCode() { return 31 * begin.hashCode() + end.hashCode(); } @Override - public String toString() { + public String toString() { return begin + "-" + end; } @@ -249,7 +251,7 @@ public String toString() { *

* If the start line and end line are the same, this range is limited to just one line. */ - public int getLineCount() { + public int getLineCount() { return end.line - begin.line + 1; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java index caeeda0f7e..0dad059471 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java +++ b/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java @@ -50,8 +50,7 @@ public final class StaticJavaParser { // use ThreadLocal to resolve possible concurrency issues. - private static final ThreadLocal localConfiguration = - ThreadLocal.withInitial(ParserConfiguration::new); + private static final ThreadLocal localConfiguration = ThreadLocal.withInitial(ParserConfiguration::new); /** * Get the configuration for the parse... methods. Deprecated method. @@ -121,8 +120,7 @@ public static CompilationUnit parse(@NotNull final InputStream in) { * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public static CompilationUnit parse(@NotNull final File file, @NotNull final Charset encoding) - throws FileNotFoundException { + public static CompilationUnit parse(@NotNull final File file, @NotNull final Charset encoding) throws FileNotFoundException { Preconditions.checkNotNull(file, "Parameter file can't be null."); Preconditions.checkNotNull(encoding, "Parameter encoding can't be null."); return handleResult(newParser().parse(file, encoding)); @@ -202,8 +200,7 @@ public static CompilationUnit parseResource(@NotNull final String path) throws I * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public static CompilationUnit parseResource(@NotNull final String path, @NotNull Charset encoding) - throws IOException { + public static CompilationUnit parseResource(@NotNull final String path, @NotNull Charset encoding) throws IOException { Preconditions.checkNotNull(path, "Parameter path can't be null."); Preconditions.checkNotNull(encoding, "Parameter encoding can't be null."); return handleResult(newParser().parseResource(path, encoding)); @@ -222,9 +219,7 @@ public static CompilationUnit parseResource(@NotNull final String path, @NotNull * @deprecated set the encoding in the {@link ParserConfiguration} */ @Deprecated - public static CompilationUnit parseResource( - @NotNull final ClassLoader classLoader, @NotNull final String path, @NotNull Charset encoding) - throws IOException { + public static CompilationUnit parseResource(@NotNull final ClassLoader classLoader, @NotNull final String path, @NotNull Charset encoding) throws IOException { Preconditions.checkNotNull(classLoader, "Parameter classLoader can't be null."); Preconditions.checkNotNull(path, "Parameter path can't be null."); Preconditions.checkNotNull(encoding, "Parameter encoding can't be null."); @@ -551,5 +546,6 @@ private static T handleResult(ParseResult result) { throw new ParseProblemException(result.getProblems()); } - private StaticJavaParser() {} + private StaticJavaParser() { + } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java b/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java index c96425cbc2..cc764547b0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java @@ -21,14 +21,13 @@ package com.github.javaparser; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Iterator; import java.util.Optional; /** * The range of tokens covered by this node. */ -public class TokenRange implements Iterable { +public class TokenRange implements Iterable { public static final TokenRange INVALID = new TokenRange(JavaToken.INVALID, JavaToken.INVALID); @@ -36,37 +35,36 @@ public class TokenRange implements Iterable { private final JavaToken end; - public TokenRange(JavaToken begin, JavaToken end) { + public TokenRange(JavaToken begin, JavaToken end) { this.begin = assertNotNull(begin); this.end = assertNotNull(end); } - public JavaToken getBegin() { + public JavaToken getBegin() { return begin; } - public JavaToken getEnd() { + public JavaToken getEnd() { return end; } - public Optional toRange() { + public Optional toRange() { if (begin.hasRange() && end.hasRange()) { - return Optional.of( - new Range(begin.getRange().get().begin, end.getRange().get().end)); + return Optional.of(new Range(begin.getRange().get().begin, end.getRange().get().end)); } return Optional.empty(); } - public TokenRange withBegin(JavaToken begin) { + public TokenRange withBegin(JavaToken begin) { return new TokenRange(assertNotNull(begin), end); } - public TokenRange withEnd(JavaToken end) { + public TokenRange withEnd(JavaToken end) { return new TokenRange(begin, assertNotNull(end)); } @Override - public String toString() { + public String toString() { StringBuilder result = new StringBuilder(); for (JavaToken t : this) { result.append(t.getText()); @@ -75,7 +73,7 @@ public String toString() { } @Override - public Iterator iterator() { + public Iterator iterator() { return new Iterator() { private boolean hasNext = true; @@ -83,12 +81,12 @@ public Iterator iterator() { private JavaToken current = begin; @Override - public boolean hasNext() { + public boolean hasNext() { return hasNext; } @Override - public JavaToken next() { + public JavaToken next() { JavaToken retval = current; if (current == null) { throw new IllegalStateException("Attempting to move past end of range."); diff --git a/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java b/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java index 8fee6a703f..30cbe1e2d5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java +++ b/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java @@ -21,13 +21,12 @@ package com.github.javaparser; import static com.github.javaparser.GeneratedJavaParserConstants.*; - import com.github.javaparser.utils.LineSeparator; /** * Complements GeneratedJavaParserConstants */ -public class TokenTypes { +public class TokenTypes { public static boolean isWhitespace(int kind) { return getCategory(kind).isWhitespace(); @@ -95,7 +94,7 @@ public static int spaceTokenKind() { * The JLS. */ public static JavaToken.Category getCategory(int kind) { - switch (kind) { + switch(kind) { case WINDOWS_EOL: case UNIX_EOL: case OLD_MAC_EOL: @@ -247,7 +246,7 @@ public static JavaToken.Category getCategory(int kind) { case RSIGNEDSHIFT: case GT: return JavaToken.Category.OPERATOR; - // The following are tokens that are only used internally by the lexer + // The following are tokens that are only used internally by the lexer case ENTER_JAVADOC_COMMENT: case ENTER_MULTILINE_COMMENT: case COMMENT_CONTENT: @@ -258,9 +257,7 @@ public static JavaToken.Category getCategory(int kind) { case TEXT_BLOCK_CONTENT: case ENTER_TEXT_BLOCK: default: - throw new AssertionError( - "Unable to categorise token kind " + kind - + " -- has it recently been added to the grammar but not classified within TokenTypes.java, perhaps?"); + throw new AssertionError("Unable to categorise token kind " + kind + " -- has it recently been added to the grammar but not classified within TokenTypes.java, perhaps?"); } } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java b/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java index 97dcaefc62..df9ccc1a7b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java +++ b/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java @@ -28,7 +28,7 @@ /** * {@link Provider} un-escaping unicode escape sequences in the input sequence. */ -public class UnicodeEscapeProcessingProvider implements Provider { +public class UnicodeEscapeProcessingProvider implements Provider { private static final char LF = '\n'; @@ -63,14 +63,14 @@ public class UnicodeEscapeProcessingProvider implements Provider { /** * Creates a {@link UnicodeEscapeProcessingProvider}. */ - public UnicodeEscapeProcessingProvider(Provider input) { + public UnicodeEscapeProcessingProvider(Provider input) { this(2048, input); } /** * Creates a {@link UnicodeEscapeProcessingProvider}. */ - public UnicodeEscapeProcessingProvider(int bufferSize, Provider input) { + public UnicodeEscapeProcessingProvider(int bufferSize, Provider input) { _input = input; _data = new char[bufferSize]; } @@ -78,19 +78,19 @@ public UnicodeEscapeProcessingProvider(int bufferSize, Provider input) { /** * The {@link LineCounter} of the input file. */ - public LineCounter getInputCounter() { + public LineCounter getInputCounter() { return _inputLine; } /** * The {@link LineCounter} of the output file. */ - public LineCounter getOutputCounter() { + public LineCounter getOutputCounter() { return _outputLine; } @Override - public int read(char[] buffer, final int offset, int len) throws IOException { + public int read(char[] buffer, final int offset, int len) throws IOException { int pos = offset; int stop = offset + len; while (pos < stop) { @@ -109,7 +109,7 @@ public int read(char[] buffer, final int offset, int len) throws IOException { } @Override - public void close() throws IOException { + public void close() throws IOException { _input.close(); } @@ -120,19 +120,21 @@ public void close() throws IOException { */ private int nextOutputChar() throws IOException { int next = nextInputChar(); - switch (next) { + switch(next) { case EOF: return EOF; - case BACKSLASH: { - if (_backslashSeen) { + case BACKSLASH: + { + if (_backslashSeen) { + return clearBackSlashSeen(next); + } + return backSlashSeen(); + } + default: + { + // An arbitrary character. return clearBackSlashSeen(next); } - return backSlashSeen(); - } - default: { - // An arbitrary character. - return clearBackSlashSeen(next); - } } } @@ -144,17 +146,19 @@ private int clearBackSlashSeen(int next) { private int backSlashSeen() throws IOException { _backslashSeen = true; int next = nextInputChar(); - switch (next) { + switch(next) { case EOF: // End of file after backslash produces the backslash itself. return BACKSLASH; - case 'u': { - return unicodeStartSeen(); - } - default: { - pushBack(next); - return BACKSLASH; - } + case 'u': + { + return unicodeStartSeen(); + } + default: + { + pushBack(next); + return BACKSLASH; + } } } @@ -162,18 +166,21 @@ private int unicodeStartSeen() throws IOException { int uCnt = 1; while (true) { int next = nextInputChar(); - switch (next) { - case EOF: { - pushBackUs(uCnt); - return BACKSLASH; - } - case 'u': { - uCnt++; - continue; - } - default: { - return readDigits(uCnt, next); - } + switch(next) { + case EOF: + { + pushBackUs(uCnt); + return BACKSLASH; + } + case 'u': + { + uCnt++; + continue; + } + default: + { + return readDigits(uCnt, next); + } } } } @@ -302,7 +309,7 @@ private void pushBack(int ch) { /** * The {@link PositionMapping} being built during processing the file. */ - public PositionMapping getPositionMapping() { + public PositionMapping getPositionMapping() { return _mappingBuilder.getMapping(); } @@ -316,14 +323,14 @@ public static final class PositionMapping { /** * Creates a {@link UnicodeEscapeProcessingProvider.PositionMapping}. */ - public PositionMapping() { + public PositionMapping() { super(); } /** * Whether this is the identity transformation. */ - public boolean isEmpty() { + public boolean isEmpty() { return _deltas.isEmpty(); } @@ -334,7 +341,7 @@ void add(int line, int column, int lineDelta, int columnDelta) { /** * Looks up the {@link PositionUpdate} for the given Position. */ - public PositionUpdate lookup(Position position) { + public PositionUpdate lookup(Position position) { int result = Collections.binarySearch(_deltas, position); if (result >= 0) { return _deltas.get(result); @@ -359,17 +366,17 @@ public static interface PositionUpdate { PositionUpdate NONE = new PositionUpdate() { @Override - public int transformLine(int line) { + public int transformLine(int line) { return line; } @Override - public int transformColumn(int column) { + public int transformColumn(int column) { return column; } @Override - public Position transform(Position pos) { + public Position transform(Position pos) { return pos; } }; @@ -413,24 +420,24 @@ private static final class DeltaInfo extends Position implements PositionUpdate /** * Creates a {@link PositionUpdate}. */ - public DeltaInfo(int line, int column, int lineDelta, int columnDelta) { + public DeltaInfo(int line, int column, int lineDelta, int columnDelta) { super(line, column); _lineDelta = lineDelta; _columnDelta = columnDelta; } @Override - public int transformLine(int sourceLine) { + public int transformLine(int sourceLine) { return sourceLine + _lineDelta; } @Override - public int transformColumn(int sourceColumn) { + public int transformColumn(int sourceColumn) { return sourceColumn + _columnDelta; } @Override - public String toString() { + public String toString() { return "(" + line + ", " + column + ": " + _lineDelta + ", " + _columnDelta + ")"; } } @@ -438,14 +445,14 @@ public String toString() { /** * Transforms the given {@link Position}. */ - public Position transform(Position pos) { + public Position transform(Position pos) { return lookup(pos).transform(pos); } /** * Transforms the given {@link Range}. */ - public Range transform(Range range) { + public Range transform(Range range) { Position begin = transform(range.begin); Position end = transform(range.end); if (begin == range.begin && end == range.end) { @@ -474,7 +481,7 @@ private static final class PositionMappingBuilder { * @param left The source {@link LineCounter}. * @param right The target {@link LineCounter}. */ - public PositionMappingBuilder(LineCounter left, LineCounter right) { + public PositionMappingBuilder(LineCounter left, LineCounter right) { _left = left; _right = right; update(); @@ -483,11 +490,11 @@ public PositionMappingBuilder(LineCounter left, LineCounter right) { /** * The built {@link PositionMapping}. */ - public PositionMapping getMapping() { + public PositionMapping getMapping() { return _mapping; } - public void update() { + public void update() { int lineDelta = _right.getLine() - _left.getLine(); int columnDelta = _right.getColumn() - _left.getColumn(); if (lineDelta != _lineDelta || columnDelta != _columnDelta) { @@ -518,57 +525,61 @@ public static final class LineCounter { /** * Creates a {@link UnicodeEscapeProcessingProvider.LineCounter}. */ - public LineCounter() { + public LineCounter() { super(); } /** * The line of the currently processed input character. */ - public int getLine() { + public int getLine() { return _line; } /** * The column of the currently processed input character. */ - public int getColumn() { + public int getColumn() { return _column; } /** * The current position. */ - public Position getPosition() { + public Position getPosition() { return new Position(getLine(), getColumn()); } /** * Analyzes the given character for line feed. */ - public int process(int ch) { - switch (ch) { - case EOF: { - break; - } - case CR: { - incLine(); - _crSeen = true; - break; - } - case LF: { - // CR LF does only count as a single line terminator. - if (_crSeen) { - _crSeen = false; - } else { + public int process(int ch) { + switch(ch) { + case EOF: + { + break; + } + case CR: + { incLine(); + _crSeen = true; + break; + } + case LF: + { + // CR LF does only count as a single line terminator. + if (_crSeen) { + _crSeen = false; + } else { + incLine(); + } + break; + } + default: + { + _crSeen = false; + _column++; } - break; - } - default: { - _crSeen = false; - _column++; - } } return ch; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java index 6d2f9bd473..3874d3d13a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java @@ -8,9 +8,9 @@ * @author Alexander Weigl * @version 1 (12/12/21) */ -public class AbstractModifier extends Node { +public class AbstractModifier extends Node { - public AbstractModifier() { + public AbstractModifier() { this(null); } @@ -19,11 +19,11 @@ protected AbstractModifier(TokenRange tokenRange) { } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { return null; } @Override - public void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java index 033a407e9d..27356d322e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java @@ -27,11 +27,9 @@ * @author Federico Tomassetti * @since July 2014 */ -public enum AccessSpecifier { - PUBLIC("public"), - PRIVATE("private"), - PROTECTED("protected"), - NONE(""); +public enum AccessSpecifier { + + PUBLIC("public"), PRIVATE("private"), PROTECTED("protected"), NONE(""); private final String codeRepresenation; @@ -39,7 +37,7 @@ public enum AccessSpecifier { this.codeRepresenation = codeRepresentation; } - public String asString() { + public String asString() { return this.codeRepresenation; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java index a11b7937b8..2684f3d6dd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java @@ -30,4 +30,5 @@ */ @Target(ElementType.CONSTRUCTOR) @Retention(RetentionPolicy.RUNTIME) -public @interface AllFieldsConstructor {} +public @interface AllFieldsConstructor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java index b4f1aae5cf..1c6358f7ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java @@ -32,9 +32,7 @@ import com.github.javaparser.metamodel.ArrayCreationLevelMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.OptionalProperty; - import java.util.Optional; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -42,27 +40,27 @@ * the first one contains the expression "1", * the second the expression "2". */ -public class ArrayCreationLevel extends Node implements NodeWithAnnotations { +public class ArrayCreationLevel extends Node implements NodeWithAnnotations { @OptionalProperty private Expression dimension; private NodeList annotations = new NodeList<>(); - public ArrayCreationLevel() { + public ArrayCreationLevel() { this(null, null, new NodeList<>()); } - public ArrayCreationLevel(int dimension) { + public ArrayCreationLevel(int dimension) { this(null, new IntegerLiteralExpr("" + dimension), new NodeList<>()); } - public ArrayCreationLevel(Expression dimension) { + public ArrayCreationLevel(Expression dimension) { this(null, dimension, new NodeList<>()); } @AllFieldsConstructor - public ArrayCreationLevel(Expression dimension, NodeList annotations) { + public ArrayCreationLevel(Expression dimension, NodeList annotations) { this(null, dimension, annotations); } @@ -70,7 +68,7 @@ public ArrayCreationLevel(Expression dimension, NodeList annotat * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ArrayCreationLevel(TokenRange tokenRange, Expression dimension, NodeList annotations) { + public ArrayCreationLevel(TokenRange tokenRange, Expression dimension, NodeList annotations) { super(tokenRange); setDimension(dimension); setAnnotations(annotations); @@ -79,13 +77,13 @@ public ArrayCreationLevel(TokenRange tokenRange, Expression dimension, NodeList< @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -96,48 +94,50 @@ public void accept(final VoidVisitor v, final A arg) { * @return this, the ArrayCreationLevel */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayCreationLevel setDimension(final Expression dimension) { + public ArrayCreationLevel setDimension(final Expression dimension) { if (dimension == this.dimension) { return this; } notifyPropertyChange(ObservableProperty.DIMENSION, this.dimension, dimension); - if (this.dimension != null) this.dimension.setParentNode(null); + if (this.dimension != null) + this.dimension.setParentNode(null); this.dimension = dimension; setAsParentNodeOf(dimension); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getDimension() { + public Optional getDimension() { return Optional.ofNullable(dimension); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayCreationLevel setAnnotations(final NodeList annotations) { + public ArrayCreationLevel setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ArrayCreationLevel removeDimension() { + public ArrayCreationLevel removeDimension() { return setDimension((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -158,19 +158,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ArrayCreationLevel clone() { + public ArrayCreationLevel clone() { return (ArrayCreationLevel) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ArrayCreationLevelMetaModel getMetaModel() { + public ArrayCreationLevelMetaModel getMetaModel() { return JavaParserMetaModel.arrayCreationLevelMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java index 9526d84ce0..007999d9ad 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java @@ -40,7 +40,6 @@ import com.github.javaparser.utils.ClassUtils; import com.github.javaparser.utils.CodeGenerationUtils; import com.github.javaparser.utils.Utils; - import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Files; @@ -51,7 +50,6 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; - import static com.github.javaparser.JavaToken.Kind.EOF; import static com.github.javaparser.Providers.UTF8; import static com.github.javaparser.Providers.provider; @@ -77,7 +75,7 @@ * @see TypeDeclaration * @see Storage */ -public class CompilationUnit extends Node { +public class CompilationUnit extends Node { private static final String JAVA_LANG = "java.lang"; @@ -94,20 +92,16 @@ public class CompilationUnit extends Node { @InternalProperty private Storage storage; - public CompilationUnit() { + public CompilationUnit() { this(null, null, new NodeList<>(), new NodeList<>(), null); } - public CompilationUnit(String packageDeclaration) { + public CompilationUnit(String packageDeclaration) { this(null, new PackageDeclaration(new Name(packageDeclaration)), new NodeList<>(), new NodeList<>(), null); } @AllFieldsConstructor - public CompilationUnit( - PackageDeclaration packageDeclaration, - NodeList imports, - NodeList> types, - ModuleDeclaration module) { + public CompilationUnit(PackageDeclaration packageDeclaration, NodeList imports, NodeList> types, ModuleDeclaration module) { this(null, packageDeclaration, imports, types, module); } @@ -115,12 +109,7 @@ public CompilationUnit( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CompilationUnit( - TokenRange tokenRange, - PackageDeclaration packageDeclaration, - NodeList imports, - NodeList> types, - ModuleDeclaration module) { + public CompilationUnit(TokenRange tokenRange, PackageDeclaration packageDeclaration, NodeList imports, NodeList> types, ModuleDeclaration module) { super(tokenRange); setPackageDeclaration(packageDeclaration); setImports(imports); @@ -131,20 +120,20 @@ public CompilationUnit( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } /** * Declare a specific printer */ - public CompilationUnit printer(Printer printer) { + public CompilationUnit printer(Printer printer) { setData(PRINTER_KEY, printer); return this; } @@ -178,7 +167,7 @@ protected Printer getPrinter(PrinterConfiguration config) { * Use {@link #getAllComments()} instead */ @Deprecated - public List getComments() { + public List getComments() { List comments = this.getAllContainedComments(); this.getComment().ifPresent(comments::add); return comments; @@ -195,7 +184,7 @@ public List getComments() { * @see com.github.javaparser.ast.comments.LineComment * @see com.github.javaparser.ast.comments.BlockComment */ - public List getAllComments() { + public List getAllComments() { List comments = this.getAllContainedComments(); this.getComment().ifPresent(comments::add); return comments; @@ -208,11 +197,11 @@ public List getAllComments() { * @return the list of imports or {@code none} if there is no import */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getImports() { + public NodeList getImports() { return imports; } - public ImportDeclaration getImport(int i) { + public ImportDeclaration getImport(int i) { return getImports().get(i); } @@ -224,7 +213,7 @@ public ImportDeclaration getImport(int i) { * @return the package declaration or {@code none} */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getPackageDeclaration() { + public Optional getPackageDeclaration() { return Optional.ofNullable(packageDeclaration); } @@ -238,7 +227,7 @@ public Optional getPackageDeclaration() { * @see EnumDeclaration */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList> getTypes() { + public NodeList> getTypes() { return types; } @@ -248,7 +237,7 @@ public NodeList> getTypes() { * * @param i the index of the type declaration to retrieve */ - public TypeDeclaration getType(int i) { + public TypeDeclaration getType(int i) { return getTypes().get(i); } @@ -259,19 +248,20 @@ public TypeDeclaration getType(int i) { * @param imports the list of imports */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompilationUnit setImports(final NodeList imports) { + public CompilationUnit setImports(final NodeList imports) { assertNotNull(imports); if (imports == this.imports) { return this; } notifyPropertyChange(ObservableProperty.IMPORTS, this.imports, imports); - if (this.imports != null) this.imports.setParentNode(null); + if (this.imports != null) + this.imports.setParentNode(null); this.imports = imports; setAsParentNodeOf(imports); return this; } - public CompilationUnit setImport(int i, ImportDeclaration imports) { + public CompilationUnit setImport(int i, ImportDeclaration imports) { getImports().set(i, imports); return this; } @@ -283,21 +273,11 @@ public CompilationUnit setImport(int i, ImportDeclaration imports) { * @param importDeclaration * @return {@code this} */ - public CompilationUnit addImport(ImportDeclaration importDeclaration) { + public CompilationUnit addImport(ImportDeclaration importDeclaration) { if (importDeclaration.isAsterisk()) { - getImports() - .removeIf(im -> Objects.equals( - getImportPackageName(im).get(), - getImportPackageName(importDeclaration).orElse(null))); - } - if (!isImplicitImport(importDeclaration) - && getImports().stream() - .noneMatch(im -> im.equals(importDeclaration) - || (im.isAsterisk() - && Objects.equals( - getImportPackageName(im).get(), - getImportPackageName(importDeclaration) - .orElse(null))))) { + getImports().removeIf(im -> Objects.equals(getImportPackageName(im).get(), getImportPackageName(importDeclaration).orElse(null))); + } + if (!isImplicitImport(importDeclaration) && getImports().stream().noneMatch(im -> im.equals(importDeclaration) || (im.isAsterisk() && Objects.equals(getImportPackageName(im).get(), getImportPackageName(importDeclaration).orElse(null))))) { getImports().add(importDeclaration); } return this; @@ -325,10 +305,7 @@ private boolean isImplicitImport(ImportDeclaration importDeclaration) { } private static Optional getImportPackageName(ImportDeclaration importDeclaration) { - return (importDeclaration.isAsterisk() - ? new Name(importDeclaration.getName(), "*") - : importDeclaration.getName()) - .getQualifier(); + return (importDeclaration.isAsterisk() ? new Name(importDeclaration.getName(), "*") : importDeclaration.getName()).getQualifier(); } /** @@ -337,12 +314,13 @@ private static Optional getImportPackageName(ImportDeclaration importDecla * @param packageDeclaration the packageDeclaration declaration to set or {@code null} to default package */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompilationUnit setPackageDeclaration(final PackageDeclaration packageDeclaration) { + public CompilationUnit setPackageDeclaration(final PackageDeclaration packageDeclaration) { if (packageDeclaration == this.packageDeclaration) { return this; } notifyPropertyChange(ObservableProperty.PACKAGE_DECLARATION, this.packageDeclaration, packageDeclaration); - if (this.packageDeclaration != null) this.packageDeclaration.setParentNode(null); + if (this.packageDeclaration != null) + this.packageDeclaration.setParentNode(null); this.packageDeclaration = packageDeclaration; setAsParentNodeOf(packageDeclaration); return this; @@ -352,19 +330,20 @@ public CompilationUnit setPackageDeclaration(final PackageDeclaration packageDec * Sets the list of types declared in this compilation unit. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompilationUnit setTypes(final NodeList> types) { + public CompilationUnit setTypes(final NodeList> types) { assertNotNull(types); if (types == this.types) { return this; } notifyPropertyChange(ObservableProperty.TYPES, this.types, types); - if (this.types != null) this.types.setParentNode(null); + if (this.types != null) + this.types.setParentNode(null); this.types = types; setAsParentNodeOf(types); return this; } - public CompilationUnit setType(int i, TypeDeclaration type) { + public CompilationUnit setType(int i, TypeDeclaration type) { NodeList> copy = new NodeList<>(); copy.addAll(getTypes()); getTypes().set(i, type); @@ -372,7 +351,7 @@ public CompilationUnit setType(int i, TypeDeclaration type) { return this; } - public CompilationUnit addType(TypeDeclaration type) { + public CompilationUnit addType(TypeDeclaration type) { NodeList> copy = new NodeList<>(); copy.addAll(getTypes()); getTypes().add(type); @@ -386,7 +365,7 @@ public CompilationUnit addType(TypeDeclaration type) { * @param name the name of the package * @return this, the {@link CompilationUnit} */ - public CompilationUnit setPackageDeclaration(String name) { + public CompilationUnit setPackageDeclaration(String name) { setPackageDeclaration(new PackageDeclaration(parseName(name))); return this; } @@ -398,7 +377,7 @@ public CompilationUnit setPackageDeclaration(String name) { * @param name the import name * @return this, the {@link CompilationUnit} */ - public CompilationUnit addImport(String name) { + public CompilationUnit addImport(String name) { return addImport(name, false, false); } @@ -410,15 +389,14 @@ public CompilationUnit addImport(String name) { * @return this, the {@link CompilationUnit} * @throws IllegalArgumentException if clazz is an anonymous or local class */ - public CompilationUnit addImport(Class clazz) { + public CompilationUnit addImport(Class clazz) { if (clazz.isArray()) { return addImport(clazz.getComponentType()); } - if (ClassUtils.isPrimitiveOrWrapper(clazz) - || JAVA_LANG.equals(clazz.getPackage().getName())) return this; + if (ClassUtils.isPrimitiveOrWrapper(clazz) || JAVA_LANG.equals(clazz.getPackage().getName())) + return this; if (clazz.isAnonymousClass() || clazz.isLocalClass()) - throw new IllegalArgumentException( - clazz.getName() + " is an anonymous or local class therefore it can't be added with addImport"); + throw new IllegalArgumentException(clazz.getName() + " is an anonymous or local class therefore it can't be added with addImport"); return addImport(clazz.getCanonicalName()); } @@ -431,7 +409,7 @@ public CompilationUnit addImport(Class clazz) { * @param isAsterisk does the import end with ".*" * @return this, the {@link CompilationUnit} */ - public CompilationUnit addImport(String name, boolean isStatic, boolean isAsterisk) { + public CompilationUnit addImport(String name, boolean isStatic, boolean isAsterisk) { if (name == null) { return this; } @@ -453,7 +431,7 @@ public CompilationUnit addImport(String name, boolean isStatic, boolean isAsteri * @param name the class name * @return the newly created class */ - public ClassOrInterfaceDeclaration addClass(String name) { + public ClassOrInterfaceDeclaration addClass(String name) { return addClass(name, Modifier.DefaultKeyword.PUBLIC); } @@ -464,9 +442,8 @@ public ClassOrInterfaceDeclaration addClass(String name) { * @param modifiers the modifiers (like Modifier.PUBLIC) * @return the newly created class */ - public ClassOrInterfaceDeclaration addClass(String name, Modifier.DefaultKeyword... modifiers) { - ClassOrInterfaceDeclaration classOrInterfaceDeclaration = - new ClassOrInterfaceDeclaration(createModifierList(modifiers), false, name); + public ClassOrInterfaceDeclaration addClass(String name, Modifier.DefaultKeyword... modifiers) { + ClassOrInterfaceDeclaration classOrInterfaceDeclaration = new ClassOrInterfaceDeclaration(createModifierList(modifiers), false, name); getTypes().add(classOrInterfaceDeclaration); return classOrInterfaceDeclaration; } @@ -477,7 +454,7 @@ public ClassOrInterfaceDeclaration addClass(String name, Modifier.DefaultKeyword * @param name the interface name * @return the newly created class */ - public ClassOrInterfaceDeclaration addInterface(String name) { + public ClassOrInterfaceDeclaration addInterface(String name) { return addInterface(name, Modifier.DefaultKeyword.PUBLIC); } @@ -488,9 +465,8 @@ public ClassOrInterfaceDeclaration addInterface(String name) { * @param modifiers the modifiers (like Modifier.PUBLIC) * @return the newly created class */ - public ClassOrInterfaceDeclaration addInterface(String name, Modifier.DefaultKeyword... modifiers) { - ClassOrInterfaceDeclaration classOrInterfaceDeclaration = - new ClassOrInterfaceDeclaration(createModifierList(modifiers), true, name); + public ClassOrInterfaceDeclaration addInterface(String name, Modifier.DefaultKeyword... modifiers) { + ClassOrInterfaceDeclaration classOrInterfaceDeclaration = new ClassOrInterfaceDeclaration(createModifierList(modifiers), true, name); getTypes().add(classOrInterfaceDeclaration); return classOrInterfaceDeclaration; } @@ -501,7 +477,7 @@ public ClassOrInterfaceDeclaration addInterface(String name, Modifier.DefaultKey * @param name the enum name * @return the newly created class */ - public EnumDeclaration addEnum(String name) { + public EnumDeclaration addEnum(String name) { return addEnum(name, Modifier.DefaultKeyword.PUBLIC); } @@ -512,7 +488,7 @@ public EnumDeclaration addEnum(String name) { * @param modifiers the modifiers (like Modifier.PUBLIC) * @return the newly created class */ - public EnumDeclaration addEnum(String name, Modifier.DefaultKeyword... modifiers) { + public EnumDeclaration addEnum(String name, Modifier.DefaultKeyword... modifiers) { EnumDeclaration enumDeclaration = new EnumDeclaration(createModifierList(modifiers), name); getTypes().add(enumDeclaration); return enumDeclaration; @@ -524,7 +500,7 @@ public EnumDeclaration addEnum(String name, Modifier.DefaultKeyword... modifiers * @param name the annotation name * @return the newly created class */ - public AnnotationDeclaration addAnnotationDeclaration(String name) { + public AnnotationDeclaration addAnnotationDeclaration(String name) { return addAnnotationDeclaration(name, Modifier.DefaultKeyword.PUBLIC); } @@ -535,7 +511,7 @@ public AnnotationDeclaration addAnnotationDeclaration(String name) { * @param modifiers the modifiers (like Modifier.PUBLIC) * @return the newly created class */ - public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier.DefaultKeyword... modifiers) { + public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier.DefaultKeyword... modifiers) { AnnotationDeclaration annotationDeclaration = new AnnotationDeclaration(createModifierList(modifiers), name); getTypes().add(annotationDeclaration); return annotationDeclaration; @@ -546,13 +522,8 @@ public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier.Defa * * @param className the class name (case-sensitive) */ - public Optional getClassByName(String className) { - return getTypes().stream() - .filter(type -> type.getNameAsString().equals(className) - && type instanceof ClassOrInterfaceDeclaration - && !((ClassOrInterfaceDeclaration) type).isInterface()) - .findFirst() - .map(t -> (ClassOrInterfaceDeclaration) t); + public Optional getClassByName(String className) { + return getTypes().stream().filter(type -> type.getNameAsString().equals(className) && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t); } /** @@ -560,10 +531,8 @@ public Optional getClassByName(String className) { * * @param className the class name (case-sensitive) */ - public List getLocalDeclarationFromClassname(String className) { - return findAll(ClassOrInterfaceDeclaration.class).stream() - .filter(cid -> cid.getFullyQualifiedName().get().endsWith(className)) - .collect(Collectors.toList()); + public List getLocalDeclarationFromClassname(String className) { + return findAll(ClassOrInterfaceDeclaration.class).stream().filter(cid -> cid.getFullyQualifiedName().get().endsWith(className)).collect(Collectors.toList()); } /** @@ -571,13 +540,8 @@ public List getLocalDeclarationFromClassname(String * * @param interfaceName the interface name (case-sensitive) */ - public Optional getInterfaceByName(String interfaceName) { - return getTypes().stream() - .filter(type -> type.getNameAsString().equals(interfaceName) - && type instanceof ClassOrInterfaceDeclaration - && ((ClassOrInterfaceDeclaration) type).isInterface()) - .findFirst() - .map(t -> (ClassOrInterfaceDeclaration) t); + public Optional getInterfaceByName(String interfaceName) { + return getTypes().stream().filter(type -> type.getNameAsString().equals(interfaceName) && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t); } /** @@ -585,18 +549,15 @@ public Optional getInterfaceByName(String interface * * @param enumName the enum name (case-sensitive) */ - public Optional getEnumByName(String enumName) { - return getTypes().stream() - .filter(type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration) - .findFirst() - .map(t -> (EnumDeclaration) t); + public Optional getEnumByName(String enumName) { + return getTypes().stream().filter(type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration).findFirst().map(t -> (EnumDeclaration) t); } /** * @return the name that the primary type in this file should have, according to the filename in {@link Storage#getFileName()}. * Empty if no file information is present (when this compilation unit wasn't parsed from a file.) */ - public Optional getPrimaryTypeName() { + public Optional getPrimaryTypeName() { return getStorage().map(Storage::getFileName).map(Utils::removeFileExtension); } @@ -605,10 +566,8 @@ public Optional getPrimaryTypeName() { * Empty if no file information is present (when this compilation unit wasn't parsed from a file.) * If for some strange reason there are multiple types of this name, the first one is returned. */ - public Optional> getPrimaryType() { - return getPrimaryTypeName().flatMap(name -> getTypes().stream() - .filter(t -> t.getNameAsString().equals(name)) - .findFirst()); + public Optional> getPrimaryType() { + return getPrimaryTypeName().flatMap(name -> getTypes().stream().filter(t -> t.getNameAsString().equals(name)).findFirst()); } /** @@ -616,11 +575,8 @@ public Optional> getPrimaryType() { * * @param annotationName the annotation name (case-sensitive) */ - public Optional getAnnotationDeclarationByName(String annotationName) { - return getTypes().stream() - .filter(type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration) - .findFirst() - .map(t -> (AnnotationDeclaration) t); + public Optional getAnnotationDeclarationByName(String annotationName) { + return getTypes().stream().filter(type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration).findFirst().map(t -> (AnnotationDeclaration) t); } /** @@ -628,16 +584,13 @@ public Optional getAnnotationDeclarationByName(String ann * * @param recordName the enum name (case-sensitive) */ - public Optional getRecordByName(String recordName) { - return getTypes().stream() - .filter(type -> type.getNameAsString().equals(recordName) && type instanceof RecordDeclaration) - .findFirst() - .map(t -> (RecordDeclaration) t); + public Optional getRecordByName(String recordName) { + return getTypes().stream().filter(type -> type.getNameAsString().equals(recordName) && type instanceof RecordDeclaration).findFirst().map(t -> (RecordDeclaration) t); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -669,7 +622,7 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public CompilationUnit removePackageDeclaration() { + public CompilationUnit removePackageDeclaration() { return setPackageDeclaration((PackageDeclaration) null); } @@ -677,40 +630,41 @@ public CompilationUnit removePackageDeclaration() { * @return the module declared in this compilation unit. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getModule() { + public Optional getModule() { return Optional.ofNullable(module); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompilationUnit setModule(final ModuleDeclaration module) { + public CompilationUnit setModule(final ModuleDeclaration module) { if (module == this.module) { return this; } notifyPropertyChange(ObservableProperty.MODULE, this.module, module); - if (this.module != null) this.module.setParentNode(null); + if (this.module != null) + this.module.setParentNode(null); this.module = module; setAsParentNodeOf(module); return this; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public CompilationUnit removeModule() { + public CompilationUnit removeModule() { return setModule((ModuleDeclaration) null); } /** * @return information about where this compilation unit was loaded from, or empty if it wasn't loaded from a file. */ - public Optional getStorage() { + public Optional getStorage() { return Optional.ofNullable(storage); } - public CompilationUnit setStorage(Path path) { + public CompilationUnit setStorage(Path path) { this.storage = new Storage(this, path); return this; } - public CompilationUnit setStorage(Path path, Charset charset) { + public CompilationUnit setStorage(Path path, Charset charset) { this.storage = new Storage(this, path, charset); return this; } @@ -720,7 +674,7 @@ public CompilationUnit setStorage(Path path, Charset charset) { * * @return the module */ - public ModuleDeclaration setModule(String name) { + public ModuleDeclaration setModule(String name) { final ModuleDeclaration module = new ModuleDeclaration(parseName(name), false); setModule(module); return module; @@ -730,7 +684,7 @@ public ModuleDeclaration setModule(String name) { * Recalculates the ranges of all nodes by looking at the sizes of the tokens. * This is useful when you have manually inserted or deleted tokens and still want to use the ranges. */ - public void recalculatePositions() { + public void recalculatePositions() { if (!getTokenRange().isPresent()) { throw new IllegalStateException("Can't recalculate positions without tokens."); } @@ -772,21 +726,21 @@ private Storage(CompilationUnit compilationUnit, Path path, Charset encoding) { /** * @return the path to the source for this CompilationUnit */ - public Path getPath() { + public Path getPath() { return path; } /** * @return the CompilationUnit this Storage is about. */ - public CompilationUnit getCompilationUnit() { + public CompilationUnit getCompilationUnit() { return compilationUnit; } /** * @return the encoding used to read the file. */ - public Charset getEncoding() { + public Charset getEncoding() { return encoding; } @@ -795,27 +749,23 @@ public Charset getEncoding() { * declaration of this compilation unit. If the package declaration is invalid (when it does not match the end * of the path) a RuntimeException is thrown. */ - public Path getSourceRoot() { - final Optional pkgAsString = - compilationUnit.getPackageDeclaration().map(NodeWithName::getNameAsString); - return pkgAsString - .map(p -> Paths.get(CodeGenerationUtils.packageToPath(p))) - .map(pkg -> subtractPaths(getDirectory(), pkg)) - .orElseGet(() -> getDirectory()); + public Path getSourceRoot() { + final Optional pkgAsString = compilationUnit.getPackageDeclaration().map(NodeWithName::getNameAsString); + return pkgAsString.map(p -> Paths.get(CodeGenerationUtils.packageToPath(p))).map(pkg -> subtractPaths(getDirectory(), pkg)).orElseGet(() -> getDirectory()); } - public String getFileName() { + public String getFileName() { return path.getFileName().toString(); } - public Path getDirectory() { + public Path getDirectory() { return path.getParent(); } /** * Saves the compilation unit to its original location */ - public void save() { + public void save() { save(cu -> compilationUnit.getPrinter().print(cu)); } @@ -825,7 +775,7 @@ public void save() { * * @param makeOutput a function that formats the compilation unit */ - public void save(Function makeOutput) { + public void save(Function makeOutput) { save(makeOutput, encoding); } @@ -836,7 +786,7 @@ public void save(Function makeOutput) { * @param makeOutput a function that formats the compilation unit * @param encoding the encoding to use for the saved file */ - public void save(Function makeOutput, Charset encoding) { + public void save(Function makeOutput, Charset encoding) { try { Files.createDirectories(path.getParent()); final String code = makeOutput.apply(getCompilationUnit()); @@ -846,7 +796,7 @@ public void save(Function makeOutput, Charset encoding) } } - public ParseResult reparse(JavaParser javaParser) { + public ParseResult reparse(JavaParser javaParser) { try { return javaParser.parse(ParseStart.COMPILATION_UNIT, provider(getPath())); } catch (IOException e) { @@ -857,19 +807,19 @@ public ParseResult reparse(JavaParser javaParser) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CompilationUnit clone() { + public CompilationUnit clone() { return (CompilationUnit) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CompilationUnitMetaModel getMetaModel() { + public CompilationUnitMetaModel getMetaModel() { return JavaParserMetaModel.compilationUnitMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/DataKey.java b/javaparser-core/src/main/java/com/github/javaparser/ast/DataKey.java index 9815b26e37..048ca1cff9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/DataKey.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/DataKey.java @@ -42,7 +42,7 @@ public abstract class DataKey { @Override - public int hashCode() { + public int hashCode() { return getClass().hashCode(); } @@ -50,7 +50,7 @@ public int hashCode() { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(Object obj) { return obj != null && getClass().equals(obj.getClass()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java index 4b021cd474..e8c7ec256b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java @@ -22,7 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -33,8 +32,8 @@ * and will be overwritten the next time the generators are run. */ @Retention(SOURCE) -@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER}) -public @interface Generated { +@Target({ PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER }) +public @interface Generated { /** * The value element must have the name of the code generator. 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 c13ffdd107..873a5b369e 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 @@ -29,7 +29,6 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ImportDeclarationMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import static com.github.javaparser.StaticJavaParser.parseName; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -45,7 +44,7 @@ * * @author Julio Vilmar Gesser */ -public class ImportDeclaration extends Node implements NodeWithName { +public class ImportDeclaration extends Node implements NodeWithName { private Name name; @@ -59,16 +58,16 @@ private ImportDeclaration() { this(new Name(), false, false); } - public ImportDeclaration(String name, boolean isStatic, boolean isAsterisk) { + public ImportDeclaration(String name, boolean isStatic, boolean isAsterisk) { this(parseName(name), isStatic, isAsterisk); } - public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk) { + public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk) { this(name, isStatic, isAsterisk, false); } @AllFieldsConstructor - public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk, boolean isJmlModel) { + public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk, boolean isJmlModel) { this(null, name, isStatic, isAsterisk, isJmlModel); } @@ -76,7 +75,7 @@ public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk, boolea * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ImportDeclaration(TokenRange tokenRange, Name name, boolean isStatic, boolean isAsterisk, boolean isJmlModel) { + public ImportDeclaration(TokenRange tokenRange, Name name, boolean isStatic, boolean isAsterisk, boolean isJmlModel) { super(tokenRange); setName(name); setStatic(isStatic); @@ -85,19 +84,19 @@ public ImportDeclaration(TokenRange tokenRange, Name name, boolean isStatic, boo customInitialization(); } - public ImportDeclaration(TokenRange range, Name name, boolean isStatic, boolean isAsterisk) { + public ImportDeclaration(TokenRange range, Name name, boolean isStatic, boolean isAsterisk) { this(range, name, isStatic, isAsterisk, false); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -105,7 +104,7 @@ public void accept(final VoidVisitor v, final A arg) { * Retrieves the name of the import (.* is not included.) */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @@ -113,17 +112,17 @@ public Name getName() { * Return if the import ends with "*". */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isAsterisk() { + public boolean isAsterisk() { return isAsterisk; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isStatic() { + public boolean isStatic() { return isStatic; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ImportDeclaration setAsterisk(final boolean isAsterisk) { + public ImportDeclaration setAsterisk(final boolean isAsterisk) { if (isAsterisk == this.isAsterisk) { return this; } @@ -133,20 +132,21 @@ public ImportDeclaration setAsterisk(final boolean isAsterisk) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ImportDeclaration setName(final Name name) { + public ImportDeclaration setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ImportDeclaration setStatic(final boolean isStatic) { + public ImportDeclaration setStatic(final boolean isStatic) { if (isStatic == this.isStatic) { return this; } @@ -157,19 +157,19 @@ public ImportDeclaration setStatic(final boolean isStatic) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ImportDeclaration clone() { + public ImportDeclaration clone() { return (ImportDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ImportDeclarationMetaModel getMetaModel() { + public ImportDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.importDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -181,16 +181,16 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isJmlModel() { + public boolean isJmlModel() { return isJmlModel; } - public void setIsJmlModel(boolean b) { + public void setIsJmlModel(boolean b) { this.isJmlModel = b; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ImportDeclaration setJmlModel(final boolean isJmlModel) { + public ImportDeclaration setJmlModel(final boolean isJmlModel) { if (isJmlModel == this.isJmlModel) { return this; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java index d3abc888ca..d9861bf699 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (2/22/21) */ -public interface Jmlish { +public interface Jmlish { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java index e9be516221..a20ba59275 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java @@ -27,16 +27,14 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.ModifierMetaModel; - import java.util.Arrays; - import static com.github.javaparser.ast.NodeList.toNodeList; import static com.github.javaparser.utils.Utils.assertNotNull; /** * A modifier, like private, public, or volatile. */ -public class Modifier extends Node { +public class Modifier extends Node { public static Modifier publicModifier() { return new Modifier(DefaultKeyword.PUBLIC); @@ -122,7 +120,7 @@ public static Modifier jmlSpecPrivateModifier() { return new Modifier(DefaultKeyword.JML_SPEC_PRIVATE); } - public interface Keyword { + public interface Keyword { String asString(); @@ -140,7 +138,8 @@ public static Modifier nonSealedModifier() { /** * The Java modifier keywords. */ - public enum DefaultKeyword implements Keyword { + public enum DefaultKeyword implements Keyword { + DEFAULT("default"), PUBLIC("public"), PROTECTED("protected"), @@ -194,19 +193,19 @@ public enum DefaultKeyword implements Keyword { * @return the Java keyword represented by this enum constant. */ @Override - public String asString() { + public String asString() { return codeRepresentation; } } private Keyword keyword; - public Modifier() { + public Modifier() { this(DefaultKeyword.PUBLIC); } @AllFieldsConstructor - public Modifier(Keyword keyword) { + public Modifier(Keyword keyword) { this(null, keyword); } @@ -214,7 +213,7 @@ public Modifier(Keyword keyword) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Modifier(TokenRange tokenRange, Keyword keyword) { + public Modifier(TokenRange tokenRange, Keyword keyword) { super(tokenRange); setKeyword(keyword); customInitialization(); @@ -222,23 +221,23 @@ public Modifier(TokenRange tokenRange, Keyword keyword) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Keyword getKeyword() { + public Keyword getKeyword() { return keyword; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Modifier setKeyword(final Keyword keyword) { + public Modifier setKeyword(final Keyword keyword) { assertNotNull(keyword); if (keyword == this.keyword) { return this; @@ -258,13 +257,13 @@ public static NodeList createModifierList(Modifier.Keyword... modifier @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Modifier clone() { + public Modifier clone() { return (Modifier) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModifierMetaModel getMetaModel() { + public ModifierMetaModel getMetaModel() { return JavaParserMetaModel.modifierMetaModel; } @@ -272,7 +271,7 @@ public ModifierMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Modifier(TokenRange tokenRange) { + public Modifier(TokenRange tokenRange) { super(tokenRange); customInitialization(); } 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 2a4a7f429f..69e840c766 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 @@ -26,14 +26,12 @@ import static java.util.Collections.unmodifiableList; import static java.util.Spliterator.DISTINCT; import static java.util.Spliterator.NONNULL; - import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; - import com.github.javaparser.HasParentNode; import com.github.javaparser.Position; import com.github.javaparser.Range; @@ -105,13 +103,12 @@ * * @author Julio Vilmar Gesser */ -public abstract class Node - implements Cloneable, HasParentNode, Visitable, NodeWithRange, NodeWithTokenRange { +public abstract class Node implements Cloneable, HasParentNode, Visitable, NodeWithRange, NodeWithTokenRange { /** * Different registration mode for observers on nodes. */ - public enum ObserverRegistrationMode { + public enum ObserverRegistrationMode { /** * Notify exclusively for changes happening on this node alone. @@ -130,9 +127,9 @@ public enum ObserverRegistrationMode { SELF_PROPAGATING } - public enum Parsedness { - PARSED, - UNPARSABLE + public enum Parsedness { + + PARSED, UNPARSABLE } /** @@ -154,8 +151,7 @@ public enum Parsedness { // usefull to find if the node is a phantom node private static final int LEVELS_TO_EXPLORE = 3; - protected static final PrinterConfiguration prettyPrinterNoCommentsConfiguration = - new DefaultPrinterConfiguration().removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)); + protected static final PrinterConfiguration prettyPrinterNoCommentsConfiguration = new DefaultPrinterConfiguration().removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)); @InternalProperty private Range range; @@ -193,7 +189,8 @@ protected Node(TokenRange tokenRange) { * It can't be written in the constructor itself because it will * be overwritten during code generation. */ - protected void customInitialization() {} + protected void customInitialization() { + } /* * If there is a printer defined in CompilationUnit, returns it @@ -207,9 +204,7 @@ protected Printer getPrinter() { * Return the printer initialized with the specified configuration */ protected Printer getPrinter(PrinterConfiguration configuration) { - return findCompilationUnit() - .map(c -> c.getPrinter(configuration)) - .orElseGet(() -> createDefaultPrinter(configuration)); + return findCompilationUnit().map(c -> c.getPrinter(configuration)).orElseGet(() -> createDefaultPrinter(configuration)); } protected Printer createDefaultPrinter() { @@ -233,7 +228,7 @@ protected PrinterConfiguration getDefaultPrinterConfiguration() { * @return comment property */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getComment() { + public Optional getComment() { return Optional.ofNullable(comment); } @@ -241,7 +236,7 @@ public Optional getComment() { * @return the range of characters in the source code that this node covers. */ @Override - public Optional getRange() { + public Optional getRange() { return Optional.ofNullable(range); } @@ -249,20 +244,17 @@ public Optional getRange() { * @return the range of tokens that this node covers. */ @Override - public Optional getTokenRange() { + public Optional getTokenRange() { return Optional.ofNullable(tokenRange); } @Override - public Node setTokenRange(TokenRange tokenRange) { + public Node setTokenRange(TokenRange tokenRange) { this.tokenRange = tokenRange; - if (tokenRange == null - || !(tokenRange.getBegin().hasRange() && tokenRange.getEnd().hasRange())) { + if (tokenRange == null || !(tokenRange.getBegin().hasRange() && tokenRange.getEnd().hasRange())) { range = null; } else { - range = new Range( - tokenRange.getBegin().getRange().get().begin, - tokenRange.getEnd().getRange().get().end); + range = new Range(tokenRange.getBegin().getRange().get().begin, tokenRange.getEnd().getRange().get().end); } return this; } @@ -272,7 +264,7 @@ public Node setTokenRange(TokenRange tokenRange) { * no range information is known, or that it is not of interest. */ @Override - public Node setRange(Range range) { + public Node setRange(Range range) { if (this.range == range) { return this; } @@ -286,7 +278,7 @@ public Node setRange(Range range) { * * @param comment to be set */ - public Node setComment(final Comment comment) { + public Node setComment(final Comment comment) { if (this.comment == comment) { return this; } @@ -328,8 +320,7 @@ public final String toString() { Printer printer = getPrinter(); LineSeparator lineSeparator = getLineEndingStyleOrDefault(LineSeparator.SYSTEM); PrinterConfiguration config = printer.getConfiguration(); - config.addOption( - new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, lineSeparator.asRawString())); + config.addOption(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, lineSeparator.asRawString())); printer.setConfiguration(config); return printer.print(this); } @@ -356,7 +347,7 @@ public final int hashCode() { } @Override - public boolean equals(final Object obj) { + public boolean equals(final Object obj) { if (!(obj instanceof Node)) { return false; } @@ -364,7 +355,7 @@ public boolean equals(final Object obj) { } @Override - public Optional getParentNode() { + public Optional getParentNode() { return Optional.ofNullable(parentNode); } @@ -374,17 +365,17 @@ public Optional getParentNode() { * * @return all nodes that have this node as their parent. */ - public List getChildNodes() { + public List getChildNodes() { return unmodifiableList(childNodes); } - public void addOrphanComment(Comment comment) { + public void addOrphanComment(Comment comment) { notifyPropertyChange(ObservableProperty.COMMENT, null, comment); orphanComments.add(comment); comment.setParentNode(this); } - public boolean removeOrphanComment(Comment comment) { + public boolean removeOrphanComment(Comment comment) { boolean removed = orphanComments.remove(comment); if (removed) { notifyPropertyChange(ObservableProperty.COMMENT, comment, null); @@ -408,7 +399,7 @@ public boolean removeOrphanComment(Comment comment) { * * @return all comments that cannot be attributed to a concept */ - public List getOrphanComments() { + public List getOrphanComments() { return unmodifiableList(orphanComments); } @@ -419,7 +410,7 @@ public List getOrphanComments() { * * @return all Comments within the node as a list */ - public List getAllContainedComments() { + public List getAllContainedComments() { List comments = new LinkedList<>(orphanComments); for (Node child : getChildNodes()) { child.getComment().ifPresent(comments::add); @@ -435,7 +426,7 @@ public List getAllContainedComments() { * @param newParentNode node to be set as parent */ @Override - public Node setParentNode(Node newParentNode) { + public Node setParentNode(Node newParentNode) { if (newParentNode == parentNode) { return this; } @@ -473,7 +464,7 @@ protected void setAsParentNodeOf(Node childNode) { * @return * @author weigl */ - public Optional getParentNodeOfType(Class clazz) { + public Optional getParentNodeOfType(Class clazz) { Node cur = this; while (cur.hasParentNode()) { cur = cur.getParentNode().get(); @@ -496,7 +487,7 @@ public Optional getParentNodeOfType(Class clazz) { @Deprecated public static final int ABSOLUTE_END_LINE = Position.ABSOLUTE_END_LINE; - public void tryAddImportToParentCompilationUnit(Class clazz) { + public void tryAddImportToParentCompilationUnit(Class clazz) { findAncestor(CompilationUnit.class).ifPresent(p -> p.addImport(clazz)); } @@ -507,7 +498,7 @@ public void tryAddImportToParentCompilationUnit(Class clazz) { * @deprecated use {@link Node#findAll(Class)} but be aware that findAll also considers the initial node. */ @Deprecated - public List getChildNodesByType(Class clazz) { + public List getChildNodesByType(Class clazz) { List nodes = new ArrayList<>(); for (Node child : getChildNodes()) { if (clazz.isInstance(child)) { @@ -522,7 +513,7 @@ public List getChildNodesByType(Class clazz) { * @deprecated use {@link Node#findAll(Class)} but be aware that findAll also considers the initial node. */ @Deprecated - public List getNodesByType(Class clazz) { + public List getNodesByType(Class clazz) { return getChildNodesByType(clazz); } @@ -537,7 +528,7 @@ public List getNodesByType(Class clazz) { * @see DataKey */ @SuppressWarnings("unchecked") - public M getData(final DataKey key) { + public M getData(final DataKey key) { if (data == null) { throw new IllegalStateException("No data of this type found. Use containsData to check for this first."); } @@ -557,7 +548,7 @@ public M getData(final DataKey key) { * @see DataKey */ @SuppressWarnings("unchecked") - public Optional findData(final DataKey key) { + public Optional findData(final DataKey key) { if (containsData(key)) { return Optional.of(getData(key)); } @@ -569,7 +560,7 @@ public Optional findData(final DataKey key) { * * @return all known data keys. */ - public Set> getDataKeys() { + public Set> getDataKeys() { if (data == null) { return emptySet(); } @@ -585,7 +576,7 @@ public Set> getDataKeys() { * @param object The data object * @see DataKey */ - public void setData(DataKey key, M object) { + public void setData(DataKey key, M object) { if (data == null) { data = new IdentityHashMap<>(); } @@ -596,7 +587,7 @@ public void setData(DataKey key, M object) { * @return does this node have data for this key? * @see DataKey */ - public boolean containsData(DataKey key) { + public boolean containsData(DataKey key) { if (data == null) { return false; } @@ -608,7 +599,7 @@ public boolean containsData(DataKey key) { * * @see DataKey */ - public void removeData(DataKey key) { + public void removeData(DataKey key) { if (data != null) { data.remove(key); } @@ -620,7 +611,7 @@ public void removeData(DataKey key) { * @return true if removed, false if it is a required property of the parent, or if the parent isn't set. * @throws RuntimeException if it fails in an unexpected way */ - public boolean remove() { + public boolean remove() { if (parentNode == null) { return false; } @@ -633,7 +624,7 @@ public boolean remove() { * @return true if removed, or if the parent isn't set. * @throws RuntimeException if it fails in an unexpected way */ - public boolean replace(Node node) { + public boolean replace(Node node) { if (parentNode == null) { return false; } @@ -650,14 +641,14 @@ public boolean replace(Node node) { * Since everything at CompilationUnit level is removable, * this method will only (silently) fail when the node is in a detached AST fragment. */ - public void removeForced() { + public void removeForced() { if (!remove()) { getParentNode().ifPresent(Node::remove); } } @Override - public Node getParentNodeForChildren() { + public Node getParentNodeForChildren() { return this; } @@ -667,18 +658,18 @@ protected void setAsParentNodeOf(NodeList list) { } } - public

void notifyPropertyChange(ObservableProperty property, P oldValue, P newValue) { + public

void notifyPropertyChange(ObservableProperty property, P oldValue, P newValue) { this.observers.forEach(o -> o.propertyChange(this, property, oldValue, newValue)); } @Override - public void unregister(AstObserver observer) { + public void unregister(AstObserver observer) { this.observers.remove(observer); this.observers.trimToSize(); } @Override - public void register(AstObserver observer) { + public void register(AstObserver observer) { // Check if the observer is not registered yet. // In this case we use a List instead of Set to save on memory space. if (!this.observers.contains(observer)) { @@ -690,11 +681,11 @@ public void register(AstObserver observer) { * Register a new observer for the given node. Depending on the mode specified also descendants, existing * and new, could be observed. For more details see ObserverRegistrationMode. */ - public void register(AstObserver observer, ObserverRegistrationMode mode) { + public void register(AstObserver observer, ObserverRegistrationMode mode) { if (mode == null) { throw new IllegalArgumentException("Mode should be not null"); } - switch (mode) { + switch(mode) { case JUST_THIS_NODE: register(observer); break; @@ -712,24 +703,25 @@ public void register(AstObserver observer, ObserverRegistrationMode mode) { /** * Register the observer for the current node and all the contained node and nodelists, recursively. */ - public void registerForSubtree(AstObserver observer) { + public void registerForSubtree(AstObserver observer) { register(observer); this.getChildNodes().forEach(c -> c.registerForSubtree(observer)); for (PropertyMetaModel property : getMetaModel().getAllPropertyMetaModels()) { if (property.isNodeList()) { NodeList nodeList = (NodeList) property.getValue(this); - if (nodeList != null) nodeList.register(observer); + if (nodeList != null) + nodeList.register(observer); } } } @Override - public boolean isRegistered(AstObserver observer) { + public boolean isRegistered(AstObserver observer) { return this.observers.contains(observer); } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -743,13 +735,13 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public Node removeComment() { + public Node removeComment() { return setComment((Comment) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Node clone() { + public Node clone() { return (Node) accept(new CloneVisitor(), null); } @@ -757,7 +749,7 @@ public Node clone() { * @return get JavaParser specific node introspection information. */ @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public NodeMetaModel getMetaModel() { + public NodeMetaModel getMetaModel() { return JavaParserMetaModel.nodeMetaModel; } @@ -765,20 +757,20 @@ public NodeMetaModel getMetaModel() { * @return whether this node was successfully parsed or not. * If it was not, only the range and tokenRange fields will be valid. */ - public Parsedness getParsed() { + public Parsedness getParsed() { return parsed; } /** * Used by the parser to flag unparsable nodes. */ - public Node setParsed(Parsedness parsed) { + public Node setParsed(Parsedness parsed) { this.parsed = parsed; return this; } @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -794,7 +786,7 @@ public boolean replace(Node node, Node replacementNode) { /** * Finds the root node of this AST by finding the topmost parent. */ - public Node findRootNode() { + public Node findRootNode() { Node n = this; while (n.getParentNode().isPresent()) { n = n.getParentNode().get(); @@ -805,7 +797,7 @@ public Node findRootNode() { /** * @return the containing CompilationUnit, or empty if this node is not inside a compilation unit. */ - public Optional findCompilationUnit() { + public Optional findCompilationUnit() { Node rootNode = findRootNode(); if (rootNode instanceof CompilationUnit) { return Optional.of((CompilationUnit) rootNode); @@ -813,14 +805,14 @@ public Optional findCompilationUnit() { return Optional.empty(); } - public LineSeparator getLineEndingStyleOrDefault(LineSeparator defaultLineSeparator) { + public LineSeparator getLineEndingStyleOrDefault(LineSeparator defaultLineSeparator) { if (getLineEndingStyle().isStandardEol()) { return getLineEndingStyle(); } return defaultLineSeparator; } - public LineSeparator getLineEndingStyle() { + public LineSeparator getLineEndingStyle() { Node current = this; // First check this node if (current.containsData(Node.LINE_SEPARATOR_KEY)) { @@ -838,37 +830,35 @@ public LineSeparator getLineEndingStyle() { return LineSeparator.SYSTEM; } - public SymbolResolver getSymbolResolver() { - return findCompilationUnit() - .map(cu -> { - if (cu.containsData(SYMBOL_RESOLVER_KEY)) { - return cu.getData(SYMBOL_RESOLVER_KEY); - } - throw new IllegalStateException( - "Symbol resolution not configured: to configure consider setting a SymbolResolver in the ParserConfiguration"); - }) - .orElseThrow(() -> new IllegalStateException("The node is not inserted in a CompilationUnit")); + public SymbolResolver getSymbolResolver() { + return findCompilationUnit().map(cu -> { + if (cu.containsData(SYMBOL_RESOLVER_KEY)) { + return cu.getData(SYMBOL_RESOLVER_KEY); + } + throw new IllegalStateException("Symbol resolution not configured: to configure consider setting a SymbolResolver in the ParserConfiguration"); + }).orElseThrow(() -> new IllegalStateException("The node is not inserted in a CompilationUnit")); } // We need to expose it because we will need to use it to inject the SymbolSolver - public static final DataKey SYMBOL_RESOLVER_KEY = new DataKey() {}; + public static final DataKey SYMBOL_RESOLVER_KEY = new DataKey() { + }; - public static final DataKey LINE_SEPARATOR_KEY = new DataKey() {}; + public static final DataKey LINE_SEPARATOR_KEY = new DataKey() { + }; - protected static final DataKey PRINTER_KEY = new DataKey() {}; + protected static final DataKey PRINTER_KEY = new DataKey() { + }; + + protected static final DataKey PHANTOM_KEY = new DataKey() { + }; - protected static final DataKey PHANTOM_KEY = new DataKey() {}; + public enum TreeTraversal { - public enum TreeTraversal { - PREORDER, - BREADTHFIRST, - POSTORDER, - PARENTS, - DIRECT_CHILDREN + PREORDER, BREADTHFIRST, POSTORDER, PARENTS, DIRECT_CHILDREN } private Iterator treeIterator(TreeTraversal traversal) { - switch (traversal) { + switch(traversal) { case BREADTHFIRST: return new BreadthFirstIterator(this); case POSTORDER: @@ -891,24 +881,22 @@ private Iterable treeIterable(TreeTraversal traversal) { /** * Make a stream of nodes using traversal algorithm "traversal". */ - public Stream stream(TreeTraversal traversal) { - return StreamSupport.stream( - Spliterators.spliteratorUnknownSize(treeIterator(traversal), NONNULL | DISTINCT), false); + public Stream stream(TreeTraversal traversal) { + return StreamSupport.stream(Spliterators.spliteratorUnknownSize(treeIterator(traversal), NONNULL | DISTINCT), false); } /** * Make a stream of nodes using pre-order traversal. */ - public Stream stream() { - return StreamSupport.stream( - Spliterators.spliteratorUnknownSize(treeIterator(PREORDER), NONNULL | DISTINCT), false); + public Stream stream() { + return StreamSupport.stream(Spliterators.spliteratorUnknownSize(treeIterator(PREORDER), NONNULL | DISTINCT), false); } /** * Walks the AST, calling the consumer for every node, with traversal algorithm "traversal". *
This is the most general walk method. All other walk and findAll methods are based on this. */ - public void walk(TreeTraversal traversal, Consumer consumer) { + public void walk(TreeTraversal traversal, Consumer consumer) { // Could be implemented as a call to the above walk method, but this is a little more efficient. for (Node node : treeIterable(traversal)) { consumer.accept(node); @@ -918,14 +906,14 @@ public void walk(TreeTraversal traversal, Consumer consumer) { /** * Walks the AST, calling the consumer for every node with pre-order traversal. */ - public void walk(Consumer consumer) { + public void walk(Consumer consumer) { walk(PREORDER, consumer); } /** * Walks the AST with pre-order traversal, calling the consumer for every node of type "nodeType". */ - public void walk(Class nodeType, Consumer consumer) { + public void walk(Class nodeType, Consumer consumer) { walk(TreeTraversal.PREORDER, node -> { if (nodeType.isAssignableFrom(node.getClass())) { consumer.accept(nodeType.cast(node)); @@ -936,7 +924,7 @@ public void walk(Class nodeType, Consumer consumer) { /** * Walks the AST with pre-order traversal, returning all nodes of type "nodeType". */ - public List findAll(Class nodeType) { + public List findAll(Class nodeType) { final List found = new ArrayList<>(); walk(nodeType, found::add); return found; @@ -945,7 +933,7 @@ public List findAll(Class nodeType) { /** * Walks the AST with specified traversal order, returning all nodes of type "nodeType". */ - public List findAll(Class nodeType, TreeTraversal traversal) { + public List findAll(Class nodeType, TreeTraversal traversal) { final List found = new ArrayList<>(); walk(traversal, node -> { if (nodeType.isAssignableFrom(node.getClass())) { @@ -958,10 +946,11 @@ public List findAll(Class nodeType, TreeTraversal travers /** * Walks the AST with pre-order traversal, returning all nodes of type "nodeType" that match the predicate. */ - public List findAll(Class nodeType, Predicate predicate) { + public List findAll(Class nodeType, Predicate predicate) { final List found = new ArrayList<>(); walk(nodeType, n -> { - if (predicate.test(n)) found.add(n); + if (predicate.test(n)) + found.add(n); }); return found; } @@ -971,7 +960,7 @@ public List findAll(Class nodeType, Predicate predicat * returns something else than null, the traversal is stopped and the function result is returned.
This is the * most general findFirst method. All other findFirst methods are based on this. */ - public Optional findFirst(TreeTraversal traversal, Function> consumer) { + public Optional findFirst(TreeTraversal traversal, Function> consumer) { for (Node node : treeIterable(traversal)) { final Optional result = consumer.apply(node); if (result.isPresent()) { @@ -984,7 +973,7 @@ public Optional findFirst(TreeTraversal traversal, Function Optional findFirst(Class nodeType) { + public Optional findFirst(Class nodeType) { return findFirst(TreeTraversal.PREORDER, node -> { if (nodeType.isAssignableFrom(node.getClass())) { return Optional.of(nodeType.cast(node)); @@ -997,7 +986,7 @@ public Optional findFirst(Class nodeType) { * Walks the AST with pre-order traversal, returning the first node of type "nodeType" that matches "predicate" or empty() if none is * found. */ - public Optional findFirst(Class nodeType, Predicate predicate) { + public Optional findFirst(Class nodeType, Predicate predicate) { return findFirst(TreeTraversal.PREORDER, node -> { if (nodeType.isAssignableFrom(node.getClass())) { final N castNode = nodeType.cast(node); @@ -1012,7 +1001,7 @@ public Optional findFirst(Class nodeType, Predicate pr /* * Find a node by a range. The search is performed on the current node and its children. */ - public Optional findByRange(Range range) { + public Optional findByRange(Range range) { if (isPhantom()) { return Optional.empty(); } @@ -1038,7 +1027,7 @@ public Optional findByRange(Range range) { * @return {@code true} if this node is an ancestor of the given node, and {@code false} otherwise. * @see HasParentNode#isDescendantOf(Node) */ - public boolean isAncestorOf(Node descendant) { + public boolean isAncestorOf(Node descendant) { return this != descendant && findFirst(Node.class, n -> n == descendant).isPresent(); } @@ -1051,17 +1040,17 @@ public static class BreadthFirstIterator implements Iterator { private final Queue queue = new LinkedList<>(); - public BreadthFirstIterator(Node node) { + public BreadthFirstIterator(Node node) { queue.add(node); } @Override - public boolean hasNext() { + public boolean hasNext() { return !queue.isEmpty(); } @Override - public Node next() { + public Node next() { Node next = queue.remove(); queue.addAll(next.getChildNodes()); return next; @@ -1075,17 +1064,17 @@ public static class DirectChildrenIterator implements Iterator { private final Iterator childrenIterator; - public DirectChildrenIterator(Node node) { + public DirectChildrenIterator(Node node) { childrenIterator = node.getChildNodes().iterator(); } @Override - public boolean hasNext() { + public boolean hasNext() { return childrenIterator.hasNext(); } @Override - public Node next() { + public Node next() { return childrenIterator.next(); } } @@ -1098,17 +1087,17 @@ public static class ParentsVisitor implements Iterator { private Node node; - public ParentsVisitor(Node node) { + public ParentsVisitor(Node node) { this.node = node; } @Override - public boolean hasNext() { + public boolean hasNext() { return node.getParentNode().isPresent(); } @Override - public Node next() { + public Node next() { node = node.getParentNode().orElse(null); return node; } @@ -1123,17 +1112,17 @@ public static class PreOrderIterator implements Iterator { private final Stack stack = new Stack<>(); - public PreOrderIterator(Node node) { + public PreOrderIterator(Node node) { stack.add(node); } @Override - public boolean hasNext() { + public boolean hasNext() { return !stack.isEmpty(); } @Override - public Node next() { + public Node next() { Node next = stack.pop(); List children = next.getChildNodes(); for (int i = children.size() - 1; i >= 0; i--) { @@ -1152,17 +1141,17 @@ public static class PostOrderIterator implements Iterator { private final Stack stack = new Stack<>(); - public PostOrderIterator(Node root) { + public PostOrderIterator(Node root) { stack.push(new Level(Collections.singletonList(root))); } @Override - public boolean hasNext() { + public boolean hasNext() { return !stack.empty(); } @Override - public Node next() { + public Node next() { while (true) { Level state = stack.peek(); if (state.isCurrentExpanded()) { @@ -1206,7 +1195,7 @@ private static class Level { private boolean expanded = false; - public Level(List nodes) { + public Level(List nodes) { this.nodes = nodes; } @@ -1215,7 +1204,7 @@ public Level(List nodes) { * * @return {@code true} if the last node was reached */ - public boolean done() { + public boolean done() { return index < nodes.size(); } @@ -1224,14 +1213,14 @@ public boolean done() { * * @return the current node */ - public Node getCurrent() { + public Node getCurrent() { return nodes.get(index); } /** * Sets the next node as the current node. */ - public void goToNext() { + public void goToNext() { index++; expanded = false; } @@ -1239,7 +1228,7 @@ public void goToNext() { /** * Marks the current node as expanded. */ - public void setCurrentExpanded() { + public void setCurrentExpanded() { expanded = true; } @@ -1248,7 +1237,7 @@ public void setCurrentExpanded() { * * @return {@code true} if the current node was expanded */ - public boolean isCurrentExpanded() { + public boolean isCurrentExpanded() { return expanded; } } @@ -1257,30 +1246,20 @@ public boolean isCurrentExpanded() { /* * Returns true if the node has an (optional) scope expression eg. method calls (object.method()) */ - public boolean hasScope() { - return (NodeWithOptionalScope.class.isAssignableFrom(this.getClass()) - && ((NodeWithOptionalScope) this).getScope().isPresent()) - || (NodeWithScope.class.isAssignableFrom(this.getClass()) && ((NodeWithScope) this).getScope() != null); + public boolean hasScope() { + return (NodeWithOptionalScope.class.isAssignableFrom(this.getClass()) && ((NodeWithOptionalScope) this).getScope().isPresent()) || (NodeWithScope.class.isAssignableFrom(this.getClass()) && ((NodeWithScope) this).getScope() != null); } /* * A "phantom" node, is a node that is not really an AST node (like the fake type of variable in FieldDeclaration or an UnknownType) */ - public boolean isPhantom() { + public boolean isPhantom() { return isPhantom(this); } private boolean isPhantom(Node node) { if (!node.containsData(PHANTOM_KEY)) { - boolean res = (node.getParentNode().isPresent() - && node.getParentNode().get().hasRange() - && node.hasRange() - && !node.getParentNode() - .get() - .getRange() - .get() - .contains(node.getRange().get()) - || inPhantomNode(node, LEVELS_TO_EXPLORE)); + boolean res = (node.getParentNode().isPresent() && node.getParentNode().get().hasRange() && node.hasRange() && !node.getParentNode().get().getRange().get().contains(node.getRange().get()) || inPhantomNode(node, LEVELS_TO_EXPLORE)); node.setData(PHANTOM_KEY, res); } return node.getData(PHANTOM_KEY); @@ -1290,8 +1269,6 @@ private boolean isPhantom(Node node) { * A node contained in a phantom node is also a phantom node. We limit how many levels up we check just for performance reasons. */ private boolean inPhantomNode(Node node, int levels) { - return node.getParentNode().isPresent() - && (isPhantom(node.getParentNode().get()) - || inPhantomNode(node.getParentNode().get(), levels - 1)); + return node.getParentNode().isPresent() && (isPhantom(node.getParentNode().get()) || inPhantomNode(node.getParentNode().get(), levels - 1)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java index c5f9f9ffd3..67c7f61607 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java @@ -44,8 +44,7 @@ * * @param the type of nodes contained. */ -public class NodeList - implements List, Iterable, HasParentNode>, Visitable, Observable { +public class NodeList implements List, Iterable, HasParentNode>, Visitable, Observable { @InternalProperty private final List innerList = new ArrayList<>(0); @@ -54,21 +53,21 @@ public class NodeList private final List observers = new ArrayList<>(); - public NodeList() { + public NodeList() { parentNode = null; } - public NodeList(Collection n) { + public NodeList(Collection n) { this.addAll(n); } @SafeVarargs - public NodeList(N... n) { + public NodeList(N... n) { this.addAll(Arrays.asList(n)); } @Override - public boolean add(N node) { + public boolean add(N node) { notifyElementAdded(innerList.size(), node); own(node); return innerList.add(node); @@ -81,7 +80,7 @@ private void own(N node) { setAsParentNodeOf(node); } - public boolean remove(Node node) { + public boolean remove(Node node) { int index = innerList.indexOf(node); if (index != -1) { notifyElementRemoved(index, node); @@ -90,11 +89,11 @@ public boolean remove(Node node) { return innerList.remove(node); } - public N removeFirst() { + public N removeFirst() { return remove(0); } - public N removeLast() { + public N removeLast() { return remove(innerList.size() - 1); } @@ -117,31 +116,30 @@ public static NodeList nodeList(NodeList nodes) { return nodeList; } - public boolean contains(N node) { + public boolean contains(N node) { return innerList.contains(node); } @Override - public int size() { + public int size() { return innerList.size(); } @Override - public N get(int i) { + public N get(int i) { return innerList.get(i); } @Override - public Iterator iterator() { + public Iterator iterator() { // Custom iterator required, to ensure that the relevant `notifyElement...` methods are called. return new NodeListIterator(innerList); } @Override - public N set(int index, N element) { + public N set(int index, N element) { if (index < 0 || index >= innerList.size()) { - throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size() - + " excluded. It is instead " + index); + throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size() + " excluded. It is instead " + index); } if (element == innerList.get(index)) { return element; @@ -153,31 +151,32 @@ public N set(int index, N element) { } @Override - public N remove(int index) { + public N remove(int index) { notifyElementRemoved(index, innerList.get(index)); N remove = innerList.remove(index); - if (remove != null) remove.setParentNode(null); + if (remove != null) + remove.setParentNode(null); return remove; } @Override - public boolean isEmpty() { + public boolean isEmpty() { return innerList.isEmpty(); } @Override - public void sort(Comparator comparator) { + public void sort(Comparator comparator) { innerList.sort(comparator); } - public void addAll(NodeList otherList) { + public void addAll(NodeList otherList) { for (N node : otherList) { add(node); } } @Override - public void add(int index, N node) { + public void add(int index, N node) { notifyElementAdded(index, node); own(node); innerList.add(index, node); @@ -186,7 +185,7 @@ public void add(int index, N node) { /** * Inserts the node before all other nodes. */ - public NodeList addFirst(N node) { + public NodeList addFirst(N node) { add(0, node); return this; } @@ -194,7 +193,7 @@ public NodeList addFirst(N node) { /** * Inserts the node after all other nodes. (This is simply an alias for add.) */ - public NodeList addLast(N node) { + public NodeList addLast(N node) { add(node); return this; } @@ -204,7 +203,7 @@ public NodeList addLast(N node) { * * @throws IllegalArgumentException when afterThisNode is not in this list. */ - public NodeList addAfter(N node, N afterThisNode) { + public NodeList addAfter(N node, N afterThisNode) { int i = indexOf(afterThisNode); if (i == -1) { throw new IllegalArgumentException("Can't find node to insert after."); @@ -218,7 +217,7 @@ public NodeList addAfter(N node, N afterThisNode) { * * @throws IllegalArgumentException when beforeThisNode is not in this list. */ - public NodeList addBefore(N node, N beforeThisNode) { + public NodeList addBefore(N node, N beforeThisNode) { int i = indexOf(beforeThisNode); if (i == -1) { throw new IllegalArgumentException("Can't find node to insert before."); @@ -230,7 +229,7 @@ public NodeList addBefore(N node, N beforeThisNode) { /** * @return the first node, or empty if the list is empty. */ - public Optional getFirst() { + public Optional getFirst() { if (isEmpty()) { return Optional.empty(); } @@ -240,7 +239,7 @@ public Optional getFirst() { /** * @return the last node, or empty if the list is empty. */ - public Optional getLast() { + public Optional getLast() { if (isEmpty()) { return Optional.empty(); } @@ -248,7 +247,7 @@ public Optional getLast() { } @Override - public Optional getParentNode() { + public Optional getParentNode() { return Optional.ofNullable(parentNode); } @@ -259,24 +258,24 @@ public Optional getParentNode() { * @return this, the NodeList */ @Override - public NodeList setParentNode(Node parentNode) { + public NodeList setParentNode(Node parentNode) { this.parentNode = parentNode; setAsParentNodeOf(innerList); return this; } @Override - public Node getParentNodeForChildren() { + public Node getParentNodeForChildren() { return parentNode; } @Override - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -284,7 +283,7 @@ public void accept(final VoidVisitor v, final A arg) { * @see java.lang.Iterable#forEach(java.util.function.Consumer) */ @Override - public void forEach(Consumer action) { + public void forEach(Consumer action) { innerList.forEach(action); } @@ -292,7 +291,7 @@ public void forEach(Consumer action) { * @see java.util.List#contains(java.lang.Object) */ @Override - public boolean contains(Object o) { + public boolean contains(Object o) { return innerList.contains(o); } @@ -300,7 +299,7 @@ public boolean contains(Object o) { * @see java.util.List#toArray() */ @Override - public Object[] toArray() { + public Object[] toArray() { return innerList.toArray(); } @@ -308,7 +307,7 @@ public Object[] toArray() { * @see java.util.List#toArray(java.lang.Object[]) */ @Override - public T[] toArray(T[] a) { + public T[] toArray(T[] a) { return innerList.toArray(a); } @@ -316,7 +315,7 @@ public T[] toArray(T[] a) { * @see java.util.List#remove(java.lang.Object) */ @Override - public boolean remove(Object o) { + public boolean remove(Object o) { if (o instanceof Node) { return remove((Node) o); } @@ -327,7 +326,7 @@ public boolean remove(Object o) { * @see java.util.List#containsAll(java.util.Collection) */ @Override - public boolean containsAll(Collection c) { + public boolean containsAll(Collection c) { return innerList.containsAll(c); } @@ -335,7 +334,7 @@ public boolean containsAll(Collection c) { * @see java.util.List#addAll(java.util.Collection) */ @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection c) { c.forEach(this::add); return !c.isEmpty(); } @@ -344,7 +343,7 @@ public boolean addAll(Collection c) { * @see java.util.List#addAll(int, java.util.Collection) */ @Override - public boolean addAll(int index, Collection c) { + public boolean addAll(int index, Collection c) { for (N e : c) { add(index++, e); } @@ -355,7 +354,7 @@ public boolean addAll(int index, Collection c) { * @see java.util.List#removeAll(java.util.Collection) */ @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { boolean changed = false; for (Object e : c) { changed = remove(e) || changed; @@ -367,7 +366,7 @@ public boolean removeAll(Collection c) { * @see java.util.List#retainAll(java.util.Collection) */ @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { boolean changed = false; for (Object e : this.stream().filter(it -> !c.contains(it)).toArray()) { if (!c.contains(e)) { @@ -381,7 +380,7 @@ public boolean retainAll(Collection c) { * @see java.util.List#replaceAll(java.util.function.UnaryOperator) */ @Override - public void replaceAll(UnaryOperator operator) { + public void replaceAll(UnaryOperator operator) { for (int i = 0; i < this.size(); i++) { set(i, operator.apply(this.get(i))); } @@ -391,7 +390,7 @@ public void replaceAll(UnaryOperator operator) { * @see java.util.Collection#removeIf(java.util.function.Predicate) */ @Override - public boolean removeIf(Predicate filter) { + public boolean removeIf(Predicate filter) { boolean changed = false; for (Object e : this.stream().filter(filter).toArray()) { changed = remove(e) || changed; @@ -403,7 +402,7 @@ public boolean removeIf(Predicate filter) { * @see java.util.List#clear() */ @Override - public void clear() { + public void clear() { while (!isEmpty()) { remove(0); } @@ -413,7 +412,7 @@ public void clear() { * @see java.util.List#equals(java.lang.Object) */ @Override - public boolean equals(Object o) { + public boolean equals(Object o) { return innerList.equals(o); } @@ -421,7 +420,7 @@ public boolean equals(Object o) { * @see java.util.List#hashCode() */ @Override - public int hashCode() { + public int hashCode() { return innerList.hashCode(); } @@ -429,7 +428,7 @@ public int hashCode() { * @see java.util.List#indexOf(java.lang.Object) */ @Override - public int indexOf(Object o) { + public int indexOf(Object o) { return innerList.indexOf(o); } @@ -437,7 +436,7 @@ public int indexOf(Object o) { * @see java.util.List#lastIndexOf(java.lang.Object) */ @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(Object o) { return innerList.lastIndexOf(o); } @@ -445,7 +444,7 @@ public int lastIndexOf(Object o) { * @see java.util.List#listIterator() */ @Override - public ListIterator listIterator() { + public ListIterator listIterator() { // Custom iterator required, to ensure that the relevant `notifyElement...` methods are called. return new NodeListIterator(innerList); } @@ -454,7 +453,7 @@ public ListIterator listIterator() { * @see java.util.List#listIterator(int) */ @Override - public ListIterator listIterator(int index) { + public ListIterator listIterator(int index) { // Custom iterator required, to ensure that the relevant `notifyElement...` methods are called. return new NodeListIterator(innerList, index); } @@ -463,7 +462,7 @@ public ListIterator listIterator(int index) { * @see java.util.Collection#parallelStream() */ @Override - public Stream parallelStream() { + public Stream parallelStream() { return innerList.parallelStream(); } @@ -471,7 +470,7 @@ public Stream parallelStream() { * @see java.util.List#subList(int, int) */ @Override - public List subList(int fromIndex, int toIndex) { + public List subList(int fromIndex, int toIndex) { return innerList.subList(fromIndex, toIndex); } @@ -479,7 +478,7 @@ public List subList(int fromIndex, int toIndex) { * @see java.util.List#spliterator() */ @Override - public Spliterator spliterator() { + public Spliterator spliterator() { return innerList.spliterator(); } @@ -496,19 +495,19 @@ private void notifyElementReplaced(int index, Node nodeAddedOrRemoved) { } @Override - public void unregister(AstObserver observer) { + public void unregister(AstObserver observer) { this.observers.remove(observer); } @Override - public void register(AstObserver observer) { + public void register(AstObserver observer) { if (!this.observers.contains(observer)) { this.observers.add(observer); } } @Override - public boolean isRegistered(AstObserver observer) { + public boolean isRegistered(AstObserver observer) { return this.observers.contains(observer); } @@ -517,7 +516,7 @@ public boolean isRegistered(AstObserver observer) { * * @return true if a replacement has happened. */ - public boolean replace(N old, N replacement) { + public boolean replace(N old, N replacement) { int i = indexOf(old); if (i == -1) { return false; @@ -529,12 +528,13 @@ public boolean replace(N old, N replacement) { /** * @return the opposite of isEmpty() */ - public boolean isNonEmpty() { + public boolean isNonEmpty() { return !isEmpty(); } - public void ifNonEmpty(Consumer> consumer) { - if (isNonEmpty()) consumer.accept(this); + public void ifNonEmpty(Consumer> consumer) { + if (isNonEmpty()) + consumer.accept(this); } public static Collector, NodeList> toNodeList() { @@ -559,7 +559,7 @@ private void setAsParentNodeOf(Node childNode) { } @Override - public String toString() { + public String toString() { return innerList.stream().map(Node::toString).collect(Collectors.joining(", ", "[", "]")); } @@ -570,48 +570,48 @@ protected class NodeListIterator implements ListIterator { N current = null; // initialize pointer to head of the list for iteration - public NodeListIterator(List list) { + public NodeListIterator(List list) { iterator = list.listIterator(); } - public NodeListIterator(List list, int index) { + public NodeListIterator(List list, int index) { iterator = list.listIterator(index); } @Override - public boolean hasNext() { + public boolean hasNext() { return iterator.hasNext(); } @Override - public N next() { + public N next() { current = iterator.next(); return current; } @Override - public boolean hasPrevious() { + public boolean hasPrevious() { return iterator.hasPrevious(); } @Override - public N previous() { + public N previous() { current = iterator.previous(); return current; } @Override - public int nextIndex() { + public int nextIndex() { return iterator.nextIndex(); } @Override - public int previousIndex() { + public int previousIndex() { return iterator.previousIndex(); } @Override - public void remove() { + public void remove() { int index = innerList.indexOf(current); if (index != -1) { notifyElementRemoved(index, current); @@ -621,11 +621,10 @@ public void remove() { } @Override - public void set(N n) { + public void set(N n) { int index = innerList.indexOf(current); if (index < 0 || index >= innerList.size()) { - throw new IllegalArgumentException("Illegal index. The index should be between 0 and " - + innerList.size() + " excluded. It is instead " + index); + throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size() + " excluded. It is instead " + index); } if (n != innerList.get(index)) { notifyElementReplaced(index, n); @@ -636,14 +635,14 @@ public void set(N n) { } @Override - public void add(N n) { + public void add(N n) { notifyElementAdded(innerList.size(), n); own(n); iterator.add(n); } @Override - public void forEachRemaining(Consumer action) { + public void forEachRemaining(Consumer action) { iterator.forEachRemaining(action); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java index a5ba4557d5..ed0bcb799e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java @@ -31,7 +31,6 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.PackageDeclarationMetaModel; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -41,23 +40,22 @@ * * @author Julio Vilmar Gesser */ -public class PackageDeclaration extends Node - implements NodeWithAnnotations, NodeWithName { +public class PackageDeclaration extends Node implements NodeWithAnnotations, NodeWithName { private NodeList annotations = new NodeList<>(); private Name name; - public PackageDeclaration() { + public PackageDeclaration() { this(null, new NodeList<>(), new Name()); } - public PackageDeclaration(Name name) { + public PackageDeclaration(Name name) { this(null, new NodeList<>(), name); } @AllFieldsConstructor - public PackageDeclaration(NodeList annotations, Name name) { + public PackageDeclaration(NodeList annotations, Name name) { this(null, annotations, name); } @@ -65,7 +63,7 @@ public PackageDeclaration(NodeList annotations, Name name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public PackageDeclaration(TokenRange tokenRange, NodeList annotations, Name name) { + public PackageDeclaration(TokenRange tokenRange, NodeList annotations, Name name) { super(tokenRange); setAnnotations(annotations); setName(name); @@ -74,13 +72,13 @@ public PackageDeclaration(TokenRange tokenRange, NodeList annota @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -91,7 +89,7 @@ public void accept(final VoidVisitor v, final A arg) { * @return list of annotations or {@code null} */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @@ -101,7 +99,7 @@ public NodeList getAnnotations() { * @return the name of the package */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @@ -109,13 +107,14 @@ public Name getName() { * @param annotations the annotations to set */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public PackageDeclaration setAnnotations(final NodeList annotations) { + public PackageDeclaration setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; @@ -127,13 +126,14 @@ public PackageDeclaration setAnnotations(final NodeList annotati * @param name the name to set */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public PackageDeclaration setName(final Name name) { + public PackageDeclaration setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -141,7 +141,7 @@ public PackageDeclaration setName(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -156,19 +156,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public PackageDeclaration clone() { + public PackageDeclaration clone() { return (PackageDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public PackageDeclarationMetaModel getMetaModel() { + public PackageDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.packageDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java index 8b8b57415f..4e42541f9e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java @@ -45,23 +45,18 @@ * * @author Julio Vilmar Gesser */ -public class AnnotationDeclaration extends TypeDeclaration - implements NodeWithAbstractModifier, Resolvable { +public class AnnotationDeclaration extends TypeDeclaration implements NodeWithAbstractModifier, Resolvable { - public AnnotationDeclaration() { + public AnnotationDeclaration() { this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>()); } - public AnnotationDeclaration(NodeList modifiers, String name) { + public AnnotationDeclaration(NodeList modifiers, String name) { this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>()); } @AllFieldsConstructor - public AnnotationDeclaration( - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList> members) { + public AnnotationDeclaration(NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members) { this(null, modifiers, annotations, name, members); } @@ -69,71 +64,66 @@ public AnnotationDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public AnnotationDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList> members) { + public AnnotationDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members) { super(tokenRange, modifiers, annotations, name, members); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public AnnotationDeclaration clone() { + public AnnotationDeclaration clone() { return (AnnotationDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public AnnotationDeclarationMetaModel getMetaModel() { + public AnnotationDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.annotationDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationDeclaration() { + public boolean isAnnotationDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationDeclaration asAnnotationDeclaration() { + public AnnotationDeclaration asAnnotationDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationDeclaration(Consumer action) { + public void ifAnnotationDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedAnnotationDeclaration resolve() { + public ResolvedAnnotationDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedAnnotationDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationDeclaration() { + public Optional toAnnotationDeclaration() { return Optional.of(this); } @Override - public FieldDeclaration addField(Type type, String name, Modifier.DefaultKeyword... modifiers) { + public FieldDeclaration addField(Type type, String name, Modifier.DefaultKeyword... modifiers) { throw new IllegalStateException("Cannot add a field to an annotation declaration."); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java index 5e04d4d111..e100328a21 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java @@ -41,10 +41,8 @@ import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedAnnotationMemberDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -55,13 +53,7 @@ * * @author Julio Vilmar Gesser */ -public class AnnotationMemberDeclaration extends BodyDeclaration - implements NodeWithJavadoc, - NodeWithSimpleName, - NodeWithType, - NodeWithPublicModifier, - NodeWithAbstractModifier, - Resolvable { +public class AnnotationMemberDeclaration extends BodyDeclaration implements NodeWithJavadoc, NodeWithSimpleName, NodeWithType, NodeWithPublicModifier, NodeWithAbstractModifier, Resolvable { private NodeList modifiers; @@ -72,21 +64,16 @@ public class AnnotationMemberDeclaration extends BodyDeclaration(), new NodeList<>(), new ClassOrInterfaceType(), new SimpleName(), null); } - public AnnotationMemberDeclaration(NodeList modifiers, Type type, String name, Expression defaultValue) { + public AnnotationMemberDeclaration(NodeList modifiers, Type type, String name, Expression defaultValue) { this(null, modifiers, new NodeList<>(), type, new SimpleName(name), defaultValue); } @AllFieldsConstructor - public AnnotationMemberDeclaration( - NodeList modifiers, - NodeList annotations, - Type type, - SimpleName name, - Expression defaultValue) { + public AnnotationMemberDeclaration(NodeList modifiers, NodeList annotations, Type type, SimpleName name, Expression defaultValue) { this(null, modifiers, annotations, type, name, defaultValue); } @@ -94,13 +81,7 @@ public AnnotationMemberDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public AnnotationMemberDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - Type type, - SimpleName name, - Expression defaultValue) { + public AnnotationMemberDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, Type type, SimpleName name, Expression defaultValue) { super(tokenRange, annotations); setModifiers(modifiers); setType(type); @@ -111,18 +92,18 @@ public AnnotationMemberDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getDefaultValue() { + public Optional getDefaultValue() { return Optional.ofNullable(defaultValue); } @@ -133,22 +114,22 @@ public Optional getDefaultValue() { * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public AnnotationMemberDeclaration removeDefaultValue() { + public AnnotationMemberDeclaration removeDefaultValue() { return setDefaultValue((Expression) null); } @@ -159,51 +140,55 @@ public AnnotationMemberDeclaration removeDefaultValue() { * @return this, the AnnotationMemberDeclaration */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AnnotationMemberDeclaration setDefaultValue(final Expression defaultValue) { + public AnnotationMemberDeclaration setDefaultValue(final Expression defaultValue) { if (defaultValue == this.defaultValue) { return this; } notifyPropertyChange(ObservableProperty.DEFAULT_VALUE, this.defaultValue, defaultValue); - if (this.defaultValue != null) this.defaultValue.setParentNode(null); + if (this.defaultValue != null) + this.defaultValue.setParentNode(null); this.defaultValue = defaultValue; setAsParentNodeOf(defaultValue); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AnnotationMemberDeclaration setModifiers(final NodeList modifiers) { + public AnnotationMemberDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AnnotationMemberDeclaration setName(final SimpleName name) { + public AnnotationMemberDeclaration setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AnnotationMemberDeclaration setType(final Type type) { + public AnnotationMemberDeclaration setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -211,7 +196,7 @@ public AnnotationMemberDeclaration setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -232,19 +217,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public AnnotationMemberDeclaration clone() { + public AnnotationMemberDeclaration clone() { return (AnnotationMemberDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public AnnotationMemberDeclarationMetaModel getMetaModel() { + public AnnotationMemberDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.annotationMemberDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -273,30 +258,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationMemberDeclaration() { + public boolean isAnnotationMemberDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationMemberDeclaration asAnnotationMemberDeclaration() { + public AnnotationMemberDeclaration asAnnotationMemberDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationMemberDeclaration(Consumer action) { + public void ifAnnotationMemberDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedAnnotationMemberDeclaration resolve() { + public ResolvedAnnotationMemberDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedAnnotationMemberDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationMemberDeclaration() { + public Optional toAnnotationMemberDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java index a4876dd14b..3179809a03 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java @@ -26,15 +26,16 @@ import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.AnnotationExpr; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.doc.JmlDocDeclaration; +import com.github.javaparser.ast.jml.doc.JmlDocType; import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.metamodel.BodyDeclarationMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -47,12 +48,12 @@ public abstract class BodyDeclaration> extends Node private NodeList annotations; - public BodyDeclaration() { + public BodyDeclaration() { this(null, new NodeList<>()); } @AllFieldsConstructor - public BodyDeclaration(NodeList annotations) { + public BodyDeclaration(NodeList annotations) { this(null, annotations); } @@ -60,7 +61,7 @@ public BodyDeclaration(NodeList annotations) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BodyDeclaration(TokenRange tokenRange, NodeList annotations) { + public BodyDeclaration(TokenRange tokenRange, NodeList annotations) { super(tokenRange); setAnnotations(annotations); customInitialization(); @@ -71,19 +72,20 @@ protected BodyDeclaration(TokenRange range) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setAnnotations(final NodeList annotations) { + public T setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return (T) this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return (T) this; @@ -91,7 +93,7 @@ public T setAnnotations(final NodeList annotations) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -106,19 +108,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BodyDeclaration clone() { + public BodyDeclaration clone() { return (BodyDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BodyDeclarationMetaModel getMetaModel() { + public BodyDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.bodyDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -132,456 +134,453 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationDeclaration() { + public boolean isAnnotationDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationDeclaration asAnnotationDeclaration() { - throw new IllegalStateException(f( - "%s is not AnnotationDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public AnnotationDeclaration asAnnotationDeclaration() { + throw new IllegalStateException(f("%s is not AnnotationDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationMemberDeclaration() { + public boolean isAnnotationMemberDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationMemberDeclaration asAnnotationMemberDeclaration() { - throw new IllegalStateException(f( - "%s is not AnnotationMemberDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public AnnotationMemberDeclaration asAnnotationMemberDeclaration() { + throw new IllegalStateException(f("%s is not AnnotationMemberDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCallableDeclaration() { + public boolean isCallableDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CallableDeclaration asCallableDeclaration() { - throw new IllegalStateException(f( - "%s is not CallableDeclaration, it is %s", this, this.getClass().getSimpleName())); + public CallableDeclaration asCallableDeclaration() { + throw new IllegalStateException(f("%s is not CallableDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassOrInterfaceDeclaration() { + public boolean isClassOrInterfaceDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassOrInterfaceDeclaration asClassOrInterfaceDeclaration() { - throw new IllegalStateException(f( - "%s is not ClassOrInterfaceDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public ClassOrInterfaceDeclaration asClassOrInterfaceDeclaration() { + throw new IllegalStateException(f("%s is not ClassOrInterfaceDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isConstructorDeclaration() { + public boolean isConstructorDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ConstructorDeclaration asConstructorDeclaration() { - throw new IllegalStateException(f( - "%s is not ConstructorDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public ConstructorDeclaration asConstructorDeclaration() { + throw new IllegalStateException(f("%s is not ConstructorDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCompactConstructorDeclaration() { + public boolean isCompactConstructorDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CompactConstructorDeclaration asCompactConstructorDeclaration() { - throw new IllegalStateException(f( - "%s is not CompactConstructorDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public CompactConstructorDeclaration asCompactConstructorDeclaration() { + throw new IllegalStateException(f("%s is not CompactConstructorDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnumConstantDeclaration() { + public boolean isEnumConstantDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnumConstantDeclaration asEnumConstantDeclaration() { - throw new IllegalStateException(f( - "%s is not EnumConstantDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public EnumConstantDeclaration asEnumConstantDeclaration() { + throw new IllegalStateException(f("%s is not EnumConstantDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnumDeclaration() { + public boolean isEnumDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnumDeclaration asEnumDeclaration() { - throw new IllegalStateException( - f("%s is not EnumDeclaration, it is %s", this, this.getClass().getSimpleName())); + public EnumDeclaration asEnumDeclaration() { + throw new IllegalStateException(f("%s is not EnumDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isFieldDeclaration() { + public boolean isFieldDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public FieldDeclaration asFieldDeclaration() { - throw new IllegalStateException( - f("%s is not FieldDeclaration, it is %s", this, this.getClass().getSimpleName())); + public FieldDeclaration asFieldDeclaration() { + throw new IllegalStateException(f("%s is not FieldDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isInitializerDeclaration() { + public boolean isInitializerDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public InitializerDeclaration asInitializerDeclaration() { - throw new IllegalStateException(f( - "%s is not InitializerDeclaration, it is %s", - this, this.getClass().getSimpleName())); + public InitializerDeclaration asInitializerDeclaration() { + throw new IllegalStateException(f("%s is not InitializerDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodDeclaration() { + public boolean isMethodDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodDeclaration asMethodDeclaration() { - throw new IllegalStateException( - f("%s is not MethodDeclaration, it is %s", this, this.getClass().getSimpleName())); + public MethodDeclaration asMethodDeclaration() { + throw new IllegalStateException(f("%s is not MethodDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeDeclaration() { + public boolean isTypeDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeDeclaration asTypeDeclaration() { - throw new IllegalStateException( - f("%s is not TypeDeclaration, it is %s", this, this.getClass().getSimpleName())); + public TypeDeclaration asTypeDeclaration() { + throw new IllegalStateException(f("%s is not TypeDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationDeclaration(Consumer action) {} + public void ifAnnotationDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationMemberDeclaration(Consumer action) {} + public void ifAnnotationMemberDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCallableDeclaration(Consumer action) {} + public void ifCallableDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassOrInterfaceDeclaration(Consumer action) {} + public void ifClassOrInterfaceDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifConstructorDeclaration(Consumer action) {} + public void ifConstructorDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnumConstantDeclaration(Consumer action) {} + public void ifEnumConstantDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnumDeclaration(Consumer action) {} + public void ifEnumDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifFieldDeclaration(Consumer action) {} + public void ifFieldDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifInitializerDeclaration(Consumer action) {} + public void ifInitializerDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodDeclaration(Consumer action) {} + public void ifMethodDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeDeclaration(Consumer action) {} + public void ifTypeDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifRecordDeclaration(Consumer action) {} + public void ifRecordDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCompactConstructorDeclaration(Consumer action) {} + public void ifCompactConstructorDeclaration(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationDeclaration() { + public Optional toAnnotationDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationMemberDeclaration() { + public Optional toAnnotationMemberDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCallableDeclaration() { + public Optional toCallableDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassOrInterfaceDeclaration() { + public Optional toClassOrInterfaceDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toConstructorDeclaration() { + public Optional toConstructorDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnumConstantDeclaration() { + public Optional toEnumConstantDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnumDeclaration() { + public Optional toEnumDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toFieldDeclaration() { + public Optional toFieldDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toInitializerDeclaration() { + public Optional toInitializerDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodDeclaration() { + public Optional toMethodDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeDeclaration() { + public Optional toTypeDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isRecordDeclaration() { + public boolean isRecordDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public RecordDeclaration asRecordDeclaration() { - throw new IllegalStateException( - f("%s is not RecordDeclaration, it is %s", this, this.getClass().getSimpleName())); + public RecordDeclaration asRecordDeclaration() { + throw new IllegalStateException(f("%s is not RecordDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toRecordDeclaration() { + public Optional toRecordDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassInvariantClause(Consumer action) { + public void ifClassInvariantClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBodyDeclaration() { + public boolean isJmlBodyDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassAccessibleDeclaration() { + public boolean isJmlClassAccessibleDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassAccessibleDeclaration asJmlClassAccessibleDeclaration() { + public JmlClassAccessibleDeclaration asJmlClassAccessibleDeclaration() { throw new IllegalStateException(f("%s is not JmlClassAccessibleDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCompactConstructorDeclaration() { + public Optional toCompactConstructorDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassAccessibleDeclaration(Consumer action) { + public void ifJmlClassAccessibleDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlRepresentsDeclaration() { + public boolean isJmlRepresentsDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlRepresentsDeclaration asJmlRepresentsDeclaration() { + public JmlRepresentsDeclaration asJmlRepresentsDeclaration() { throw new IllegalStateException(f("%s is not JmlRepresentsDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlRepresentsDeclaration() { + public Optional toJmlRepresentsDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlRepresentsDeclaration(Consumer action) { + public void ifJmlRepresentsDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocDeclaration() { + public boolean isJmlDocDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocDeclaration asJmlDocDeclaration() { + public JmlDocDeclaration asJmlDocDeclaration() { throw new IllegalStateException(f("%s is not JmlDocDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocDeclaration() { + public Optional toJmlDocDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocDeclaration(Consumer action) { + public void ifJmlDocDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassAccessibleDeclaration() { + public Optional toJmlClassAccessibleDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassInvariantDeclaration() { + public boolean isJmlClassInvariantDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassExprDeclaration asJmlClassInvariantDeclaration() { + public JmlClassExprDeclaration asJmlClassInvariantDeclaration() { throw new IllegalStateException(f("%s is not JmlClassInvariantDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassInvariantDeclaration() { + public Optional toJmlClassInvariantDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassInvariantDeclaration(Consumer action) { + public void ifJmlClassInvariantDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassLevel() { + public boolean isJmlClassLevel() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassLevelDeclaration asJmlClassLevel() { + public JmlClassLevelDeclaration asJmlClassLevel() { throw new IllegalStateException(f("%s is not JmlClassLevelDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassLevel() { + public Optional toJmlClassLevel() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassLevel(Consumer action) { + public void ifJmlClassLevel(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocType() { + public boolean isJmlDocType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocType asJmlDocType() { + public JmlDocType asJmlDocType() { throw new IllegalStateException(f("%s is not JmlDocType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocType() { + public Optional toJmlDocType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocType(Consumer action) { + public void ifJmlDocType(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlFieldDeclaration() { + public boolean isJmlFieldDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlFieldDeclaration asJmlFieldDeclaration() { + public JmlFieldDeclaration asJmlFieldDeclaration() { throw new IllegalStateException(f("%s is not JmlFieldDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlFieldDeclaration() { + public Optional toJmlFieldDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlFieldDeclaration(Consumer action) { + public void ifJmlFieldDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMethodDeclaration() { + public boolean isJmlMethodDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMethodDeclaration asJmlMethodDeclaration() { + public JmlMethodDeclaration asJmlMethodDeclaration() { throw new IllegalStateException(f("%s is not JmlMethodDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMethodDeclaration() { + public Optional toJmlMethodDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMethodDeclaration(Consumer action) { + public void ifJmlMethodDeclaration(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassAxiomDeclaration() { + public boolean isJmlClassAxiomDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassExprDeclaration() { + public boolean isJmlClassExprDeclaration() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassExprDeclaration asJmlClassExprDeclaration() { + public JmlClassExprDeclaration asJmlClassExprDeclaration() { throw new IllegalStateException(f("%s is not JmlClassExprDeclaration, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassExprDeclaration() { + public Optional toJmlClassExprDeclaration() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassExprDeclaration(Consumer action) { + public void ifJmlClassExprDeclaration(Consumer action) { } - public boolean isJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public boolean isJmlClassLevelDeclaration() { return false; } - public JmlClassLevelDeclaration asJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public JmlClassLevelDeclaration asJmlClassLevelDeclaration() { throw new IllegalStateException(f("%s is not JmlClassLevelDeclaration, it is %s", this, this.getClass().getSimpleName())); } - public Optional toJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public Optional toJmlClassLevelDeclaration() { return Optional.empty(); } - public void ifJmlClassLevelDeclaration(Consumer action) { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public void ifJmlClassLevelDeclaration(Consumer action) { } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java index a5d5bdb5c3..34d915a506 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java @@ -23,15 +23,15 @@ import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; - import java.util.List; import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.expr.AnnotationExpr; import com.github.javaparser.ast.expr.SimpleName; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.*; import com.github.javaparser.ast.nodeTypes.modifiers.*; import com.github.javaparser.ast.observer.ObservableProperty; @@ -47,18 +47,7 @@ /** * Represents a declaration which is callable eg. a method or a constructor. */ -public abstract class CallableDeclaration> extends BodyDeclaration - implements NodeWithAccessModifiers, - NodeWithDeclaration, - NodeWithSimpleName, - NodeWithParameters, - NodeWithThrownExceptions, - NodeWithTypeParameters, - NodeWithJavadoc, - NodeWithAbstractModifier, - NodeWithStaticModifier, - NodeWithFinalModifier, - NodeWithStrictfpModifier, NodeWithContracts { +public abstract class CallableDeclaration> extends BodyDeclaration implements NodeWithAccessModifiers, NodeWithDeclaration, NodeWithSimpleName, NodeWithParameters, NodeWithThrownExceptions, NodeWithTypeParameters, NodeWithJavadoc, NodeWithAbstractModifier, NodeWithStaticModifier, NodeWithFinalModifier, NodeWithStrictfpModifier, NodeWithContracts { private NodeList modifiers; @@ -76,14 +65,7 @@ public abstract class CallableDeclaration> exte private NodeList contracts = new NodeList<>(); @AllFieldsConstructor - CallableDeclaration( - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - ReceiverParameter receiverParameter, NodeList contracts) { + CallableDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, ReceiverParameter receiverParameter, NodeList contracts) { this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts); } @@ -91,15 +73,7 @@ public abstract class CallableDeclaration> exte * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CallableDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - ReceiverParameter receiverParameter, NodeList contracts) { + public CallableDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, ReceiverParameter receiverParameter, NodeList contracts) { super(tokenRange, annotations); setModifiers(modifiers); setTypeParameters(typeParameters); @@ -118,95 +92,100 @@ public CallableDeclaration( * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setModifiers(final NodeList modifiers) { + public T setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return (T) this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setName(final SimpleName name) { + public T setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return (T) this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getParameters() { + public NodeList getParameters() { return parameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setParameters(final NodeList parameters) { + public T setParameters(final NodeList parameters) { assertNotNull(parameters); if (parameters == this.parameters) { return (T) this; } notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters); - if (this.parameters != null) this.parameters.setParentNode(null); + if (this.parameters != null) + this.parameters.setParentNode(null); this.parameters = parameters; setAsParentNodeOf(parameters); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getThrownExceptions() { + public NodeList getThrownExceptions() { return thrownExceptions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setThrownExceptions(final NodeList thrownExceptions) { + public T setThrownExceptions(final NodeList thrownExceptions) { assertNotNull(thrownExceptions); if (thrownExceptions == this.thrownExceptions) { return (T) this; } notifyPropertyChange(ObservableProperty.THROWN_EXCEPTIONS, this.thrownExceptions, thrownExceptions); - if (this.thrownExceptions != null) this.thrownExceptions.setParentNode(null); + if (this.thrownExceptions != null) + this.thrownExceptions.setParentNode(null); this.thrownExceptions = thrownExceptions; setAsParentNodeOf(thrownExceptions); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypeParameters() { + public NodeList getTypeParameters() { return typeParameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setTypeParameters(final NodeList typeParameters) { + public T setTypeParameters(final NodeList typeParameters) { assertNotNull(typeParameters); if (typeParameters == this.typeParameters) { return (T) this; } notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters); - if (this.typeParameters != null) this.typeParameters.setParentNode(null); + if (this.typeParameters != null) + this.typeParameters.setParentNode(null); this.typeParameters = typeParameters; setAsParentNodeOf(typeParameters); return (T) this; @@ -231,7 +210,7 @@ protected String appendThrowsIfRequested(boolean includingThrows) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -290,48 +269,45 @@ private Signature(String name, List parameterTypes) { this.parameterTypes = parameterTypes; } - public String getName() { + public String getName() { return name; } - public List getParameterTypes() { + public List getParameterTypes() { return parameterTypes; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Signature signature = (Signature) o; - if (!name.equals(signature.name)) return false; + if (!name.equals(signature.name)) + return false; return parameterTypes.equals(signature.parameterTypes); } @Override - public int hashCode() { + public int hashCode() { int result = name.hashCode(); result = 31 * result + parameterTypes.hashCode(); return result; } - public String asString() { + public String asString() { return parameterTypes.stream().map(Type::asString).collect(joining(", ", name + "(", ")")); } @Override - public String toString() { + public String toString() { return asString(); } } - public Signature getSignature() { - return new Signature( - getName().getIdentifier(), - getParameters().stream() - .map(this::getTypeWithVarargsAsArray) - .map(this::stripGenerics) - .map(this::stripAnnotations) - .collect(toList())); + public Signature getSignature() { + return new Signature(getName().getIdentifier(), getParameters().stream().map(this::getTypeWithVarargsAsArray).map(this::stripGenerics).map(this::stripAnnotations).collect(toList())); } private Type stripAnnotations(Type type) { @@ -361,19 +337,19 @@ private Type getTypeWithVarargsAsArray(Parameter p) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CallableDeclaration clone() { + public CallableDeclaration clone() { return (CallableDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CallableDeclarationMetaModel getMetaModel() { + public CallableDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.callableDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -422,59 +398,60 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCallableDeclaration() { + public boolean isCallableDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CallableDeclaration asCallableDeclaration() { + public CallableDeclaration asCallableDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCallableDeclaration(Consumer action) { + public void ifCallableDeclaration(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getReceiverParameter() { + public Optional getReceiverParameter() { return Optional.ofNullable(receiverParameter); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setReceiverParameter(final ReceiverParameter receiverParameter) { + public T setReceiverParameter(final ReceiverParameter receiverParameter) { if (receiverParameter == this.receiverParameter) { return (T) this; } notifyPropertyChange(ObservableProperty.RECEIVER_PARAMETER, this.receiverParameter, receiverParameter); - if (this.receiverParameter != null) this.receiverParameter.setParentNode(null); + if (this.receiverParameter != null) + this.receiverParameter.setParentNode(null); this.receiverParameter = receiverParameter; setAsParentNodeOf(receiverParameter); return (T) this; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public CallableDeclaration removeReceiverParameter() { + public CallableDeclaration removeReceiverParameter() { return setReceiverParameter((ReceiverParameter) null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCallableDeclaration() { + public Optional toCallableDeclaration() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setContracts(final NodeList contracts) { + public T setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return (T) this; @@ -490,14 +467,14 @@ public T setContracts(final NodeList contracts) { /* * Returns true if the method has a variable number of arguments */ - public boolean isVariableArityMethod() { + public boolean isVariableArityMethod() { return getParameters().size() > 0 && getParameters().getLast().get().isVarArgs(); } /* * Returns true if the method has a fixed number of arguments */ - public boolean isFixedArityMethod() { + public boolean isFixedArityMethod() { return !isVariableArityMethod(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java index 63c4601a93..67c0cadf10 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class ClassAccessibleClause { +public class ClassAccessibleClause { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java index f85009bc89..97dadb0dcd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java @@ -40,10 +40,8 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -51,13 +49,7 @@ * * @author Julio Vilmar Gesser */ -public class ClassOrInterfaceDeclaration extends TypeDeclaration - implements NodeWithImplements, - NodeWithExtends, - NodeWithTypeParameters, - NodeWithAbstractModifier, - NodeWithFinalModifier, - Resolvable { +public class ClassOrInterfaceDeclaration extends TypeDeclaration implements NodeWithImplements, NodeWithExtends, NodeWithTypeParameters, NodeWithAbstractModifier, NodeWithFinalModifier, Resolvable { private boolean isInterface; @@ -70,74 +62,24 @@ public class ClassOrInterfaceDeclaration extends TypeDeclaration permittedTypes; - public ClassOrInterfaceDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - false, - new SimpleName(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>()); + public ClassOrInterfaceDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), false, new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>()); } - public ClassOrInterfaceDeclaration( - final NodeList modifiers, final boolean isInterface, final String name) { - this( - null, - modifiers, - new NodeList<>(), - isInterface, - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>()); + public ClassOrInterfaceDeclaration(final NodeList modifiers, final boolean isInterface, final String name) { + this(null, modifiers, new NodeList<>(), isInterface, new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>()); } @AllFieldsConstructor - public ClassOrInterfaceDeclaration( - final NodeList modifiers, - final NodeList annotations, - final boolean isInterface, - final SimpleName name, - final NodeList typeParameters, - final NodeList extendedTypes, - final NodeList implementedTypes, - final NodeList permittedTypes, - final NodeList> members) { - this( - null, - modifiers, - annotations, - isInterface, - name, - typeParameters, - extendedTypes, - implementedTypes, - permittedTypes, - members); + public ClassOrInterfaceDeclaration(final NodeList modifiers, final NodeList annotations, final boolean isInterface, final SimpleName name, final NodeList typeParameters, final NodeList extendedTypes, final NodeList implementedTypes, final NodeList permittedTypes, final NodeList> members) { + this(null, modifiers, annotations, isInterface, name, typeParameters, extendedTypes, implementedTypes, permittedTypes, members); } /** * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ClassOrInterfaceDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - boolean isInterface, - SimpleName name, - NodeList typeParameters, - NodeList extendedTypes, - NodeList implementedTypes, - NodeList permittedTypes, - NodeList> members) { + public ClassOrInterfaceDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, boolean isInterface, SimpleName name, NodeList typeParameters, NodeList extendedTypes, NodeList implementedTypes, NodeList permittedTypes, NodeList> members) { super(tokenRange, modifiers, annotations, name, members); setInterface(isInterface); setTypeParameters(typeParameters); @@ -149,82 +91,85 @@ public ClassOrInterfaceDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getExtendedTypes() { + public NodeList getExtendedTypes() { return extendedTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getImplementedTypes() { + public NodeList getImplementedTypes() { return implementedTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getPermittedTypes() { + public NodeList getPermittedTypes() { return permittedTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypeParameters() { + public NodeList getTypeParameters() { return typeParameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isInterface() { + public boolean isInterface() { return isInterface; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration setExtendedTypes(final NodeList extendedTypes) { + public ClassOrInterfaceDeclaration setExtendedTypes(final NodeList extendedTypes) { assertNotNull(extendedTypes); if (extendedTypes == this.extendedTypes) { return this; } notifyPropertyChange(ObservableProperty.EXTENDED_TYPES, this.extendedTypes, extendedTypes); - if (this.extendedTypes != null) this.extendedTypes.setParentNode(null); + if (this.extendedTypes != null) + this.extendedTypes.setParentNode(null); this.extendedTypes = extendedTypes; setAsParentNodeOf(extendedTypes); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration setImplementedTypes(final NodeList implementedTypes) { + public ClassOrInterfaceDeclaration setImplementedTypes(final NodeList implementedTypes) { assertNotNull(implementedTypes); if (implementedTypes == this.implementedTypes) { return this; } notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes); - if (this.implementedTypes != null) this.implementedTypes.setParentNode(null); + if (this.implementedTypes != null) + this.implementedTypes.setParentNode(null); this.implementedTypes = implementedTypes; setAsParentNodeOf(implementedTypes); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration setPermittedTypes(final NodeList permittedTypes) { + public ClassOrInterfaceDeclaration setPermittedTypes(final NodeList permittedTypes) { assertNotNull(permittedTypes); if (permittedTypes == this.permittedTypes) { return this; } notifyPropertyChange(ObservableProperty.PERMITTED_TYPES, this.permittedTypes, permittedTypes); - if (this.permittedTypes != null) this.permittedTypes.setParentNode(null); + if (this.permittedTypes != null) + this.permittedTypes.setParentNode(null); this.permittedTypes = permittedTypes; setAsParentNodeOf(permittedTypes); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration setInterface(final boolean isInterface) { + public ClassOrInterfaceDeclaration setInterface(final boolean isInterface) { if (isInterface == this.isInterface) { return this; } @@ -234,13 +179,14 @@ public ClassOrInterfaceDeclaration setInterface(final boolean isInterface) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration setTypeParameters(final NodeList typeParameters) { + public ClassOrInterfaceDeclaration setTypeParameters(final NodeList typeParameters) { assertNotNull(typeParameters); if (typeParameters == this.typeParameters) { return this; } notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters); - if (this.typeParameters != null) this.typeParameters.setParentNode(null); + if (this.typeParameters != null) + this.typeParameters.setParentNode(null); this.typeParameters = typeParameters; setAsParentNodeOf(typeParameters); return this; @@ -248,7 +194,7 @@ public ClassOrInterfaceDeclaration setTypeParameters(final NodeList p instanceof LocalClassDeclarationStmt).orElse(false); } @Override - public Optional getFullyQualifiedName() { + public Optional getFullyQualifiedName() { if (isLocalClassDeclaration()) { return Optional.empty(); } @@ -298,25 +244,25 @@ public Optional getFullyQualifiedName() { * @return is this an inner class? * NOTE: many people are confused over terminology. Refer to https://docs.oracle.com/javase/tutorial/java/javaOO/nested.html . */ - public boolean isInnerClass() { + public boolean isInnerClass() { return isNestedType() && !isInterface && !isStatic(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ClassOrInterfaceDeclaration clone() { + public ClassOrInterfaceDeclaration clone() { return (ClassOrInterfaceDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ClassOrInterfaceDeclarationMetaModel getMetaModel() { + public ClassOrInterfaceDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.classOrInterfaceDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -349,30 +295,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassOrInterfaceDeclaration() { + public boolean isClassOrInterfaceDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassOrInterfaceDeclaration asClassOrInterfaceDeclaration() { + public ClassOrInterfaceDeclaration asClassOrInterfaceDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassOrInterfaceDeclaration(Consumer action) { + public void ifClassOrInterfaceDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedReferenceTypeDeclaration resolve() { + public ResolvedReferenceTypeDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedReferenceTypeDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassOrInterfaceDeclaration() { + public Optional toClassOrInterfaceDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java index 957b366186..4966cf02b8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class ClassRepresentsClause { +public class ClassRepresentsClause { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java index f19d9def74..5503d1af8f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java @@ -21,10 +21,8 @@ package com.github.javaparser.ast.body; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.expr.AnnotationExpr; @@ -66,14 +64,7 @@ * @see JLS 8.10.3 - Record Constructor Declarations * @since 3.22.0 */ -public class CompactConstructorDeclaration extends BodyDeclaration - implements NodeWithBlockStmt, - NodeWithAccessModifiers, - NodeWithJavadoc, - NodeWithSimpleName, - NodeWithThrownExceptions, - NodeWithTypeParameters, - Resolvable { +public class CompactConstructorDeclaration extends BodyDeclaration implements NodeWithBlockStmt, NodeWithAccessModifiers, NodeWithJavadoc, NodeWithSimpleName, NodeWithThrownExceptions, NodeWithTypeParameters, Resolvable { private NodeList modifiers; @@ -85,47 +76,20 @@ public class CompactConstructorDeclaration extends BodyDeclaration thrownExceptions; - public CompactConstructorDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new SimpleName(), - new NodeList<>(), - new BlockStmt()); + public CompactConstructorDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new BlockStmt()); } - public CompactConstructorDeclaration(String name) { - this( - null, - new NodeList<>(new Modifier()), - new NodeList<>(), - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new BlockStmt()); + public CompactConstructorDeclaration(String name) { + this(null, new NodeList<>(new Modifier()), new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new BlockStmt()); } - public CompactConstructorDeclaration(NodeList modifiers, String name) { - this( - null, - modifiers, - new NodeList<>(), - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new BlockStmt()); + public CompactConstructorDeclaration(NodeList modifiers, String name) { + this(null, modifiers, new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new BlockStmt()); } @AllFieldsConstructor - public CompactConstructorDeclaration( - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList thrownExceptions, - BlockStmt body) { + public CompactConstructorDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList thrownExceptions, BlockStmt body) { this(null, modifiers, annotations, typeParameters, name, thrownExceptions, body); } @@ -133,14 +97,7 @@ public CompactConstructorDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CompactConstructorDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList thrownExceptions, - BlockStmt body) { + public CompactConstructorDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList thrownExceptions, BlockStmt body) { super(tokenRange, annotations); setModifiers(modifiers); setTypeParameters(typeParameters); @@ -152,18 +109,18 @@ public CompactConstructorDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getBody() { + public BlockStmt getBody() { return body; } @@ -174,85 +131,90 @@ public BlockStmt getBody() { * @return this, the ConstructorDeclaration */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompactConstructorDeclaration setBody(final BlockStmt body) { + public CompactConstructorDeclaration setBody(final BlockStmt body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompactConstructorDeclaration setModifiers(final NodeList modifiers) { + public CompactConstructorDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompactConstructorDeclaration setName(final SimpleName name) { + public CompactConstructorDeclaration setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getThrownExceptions() { + public NodeList getThrownExceptions() { return thrownExceptions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompactConstructorDeclaration setThrownExceptions(final NodeList thrownExceptions) { + public CompactConstructorDeclaration setThrownExceptions(final NodeList thrownExceptions) { assertNotNull(thrownExceptions); if (thrownExceptions == this.thrownExceptions) { return this; } notifyPropertyChange(ObservableProperty.THROWN_EXCEPTIONS, this.thrownExceptions, thrownExceptions); - if (this.thrownExceptions != null) this.thrownExceptions.setParentNode(null); + if (this.thrownExceptions != null) + this.thrownExceptions.setParentNode(null); this.thrownExceptions = thrownExceptions; setAsParentNodeOf(thrownExceptions); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypeParameters() { + public NodeList getTypeParameters() { return typeParameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CompactConstructorDeclaration setTypeParameters(final NodeList typeParameters) { + public CompactConstructorDeclaration setTypeParameters(final NodeList typeParameters) { assertNotNull(typeParameters); if (typeParameters == this.typeParameters) { return this; } notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters); - if (this.typeParameters != null) this.typeParameters.setParentNode(null); + if (this.typeParameters != null) + this.typeParameters.setParentNode(null); this.typeParameters = typeParameters; setAsParentNodeOf(typeParameters); return this; @@ -263,8 +225,7 @@ public CompactConstructorDeclaration setTypeParameters(final NodeList * [accessSpecifier] className [throws exceptionsList] */ - public String getDeclarationAsString( - boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { + public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { StringBuilder sb = new StringBuilder(); if (includingModifiers) { AccessSpecifier accessSpecifier = getAccessSpecifier(); @@ -297,7 +258,7 @@ protected String appendThrowsIfRequested(boolean includingThrows) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -324,19 +285,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CompactConstructorDeclaration clone() { + public CompactConstructorDeclaration clone() { return (CompactConstructorDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CompactConstructorDeclarationMetaModel getMetaModel() { + public CompactConstructorDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.compactConstructorDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -371,37 +332,37 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCompactConstructorDeclaration() { + public boolean isCompactConstructorDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CompactConstructorDeclaration asCompactConstructorDeclaration() { + public CompactConstructorDeclaration asCompactConstructorDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCompactConstructorDeclaration(Consumer action) { + public void ifCompactConstructorDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedConstructorDeclaration resolve() { + public ResolvedConstructorDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedConstructorDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCompactConstructorDeclaration() { + public Optional toCompactConstructorDeclaration() { return Optional.of(this); } /** * This constructor is used by the parser and is considered private. */ - public CompactConstructorDeclaration(TokenRange tokenRange, NodeList annotations, BlockStmt body) { + public CompactConstructorDeclaration(TokenRange tokenRange, NodeList annotations, BlockStmt body) { super(tokenRange, annotations); setBody(body); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java index 6d33b529e5..07529d0375 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java @@ -21,14 +21,13 @@ package com.github.javaparser.ast.body; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.expr.AnnotationExpr; import com.github.javaparser.ast.expr.SimpleName; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.*; import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAccessModifiers; import com.github.javaparser.ast.observer.ObservableProperty; @@ -51,86 +50,36 @@ * * @author Julio Vilmar Gesser */ -public class ConstructorDeclaration extends CallableDeclaration - implements NodeWithBlockStmt, - NodeWithAccessModifiers, - NodeWithJavadoc, - NodeWithSimpleName, - NodeWithParameters, - NodeWithThrownExceptions, - NodeWithTypeParameters, - Resolvable { +public class ConstructorDeclaration extends CallableDeclaration implements NodeWithBlockStmt, NodeWithAccessModifiers, NodeWithJavadoc, NodeWithSimpleName, NodeWithParameters, NodeWithThrownExceptions, NodeWithTypeParameters, Resolvable { private BlockStmt body; - public ConstructorDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new SimpleName(), - new NodeList<>(), - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); + public ConstructorDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>()); } - public ConstructorDeclaration(String name) { - this( - null, - new NodeList<>(new Modifier()), - new NodeList<>(), - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); + public ConstructorDeclaration(String name) { + this(null, new NodeList<>(new Modifier()), new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>()); } - public ConstructorDeclaration(NodeList modifiers, String name) { - this( - null, - modifiers, - new NodeList<>(), - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); + public ConstructorDeclaration(NodeList modifiers, String name) { + this(null, modifiers, new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>()); } - public ConstructorDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, NodeList contracts) { + public ConstructorDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, NodeList contracts) { this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, null, contracts); } - public ConstructorDeclaration( - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - BlockStmt body, ReceiverParameter receiverParameter) { + public ConstructorDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) { this(modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, new NodeList<>()); } @AllFieldsConstructor - public ConstructorDeclaration( - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - BlockStmt body, - ReceiverParameter receiverParameter, NodeList contracts) { + public ConstructorDeclaration(NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList contracts) { this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, contracts); } - public ConstructorDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) { + public ConstructorDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) { this(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, new NodeList<>()); } @@ -138,43 +87,26 @@ public ConstructorDeclaration(TokenRange tokenRange, NodeList modifier * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ConstructorDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - BlockStmt body, - ReceiverParameter receiverParameter, NodeList contracts) { - super( - tokenRange, - modifiers, - annotations, - typeParameters, - name, - parameters, - thrownExceptions, - receiverParameter, contracts); + public ConstructorDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList contracts) { + super(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts); setBody(body); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getBody() { + public BlockStmt getBody() { return body; } @@ -185,40 +117,41 @@ public BlockStmt getBody() { * @return this, the ConstructorDeclaration */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ConstructorDeclaration setBody(final BlockStmt body) { + public ConstructorDeclaration setBody(final BlockStmt body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Override - public ConstructorDeclaration setModifiers(final NodeList modifiers) { + public ConstructorDeclaration setModifiers(final NodeList modifiers) { return super.setModifiers(modifiers); } @Override - public ConstructorDeclaration setName(final SimpleName name) { + public ConstructorDeclaration setName(final SimpleName name) { return super.setName(name); } @Override - public ConstructorDeclaration setParameters(final NodeList parameters) { + public ConstructorDeclaration setParameters(final NodeList parameters) { return super.setParameters(parameters); } @Override - public ConstructorDeclaration setThrownExceptions(final NodeList thrownExceptions) { + public ConstructorDeclaration setThrownExceptions(final NodeList thrownExceptions) { return super.setThrownExceptions(thrownExceptions); } @Override - public ConstructorDeclaration setTypeParameters(final NodeList typeParameters) { + public ConstructorDeclaration setTypeParameters(final NodeList typeParameters) { return super.setTypeParameters(typeParameters); } @@ -229,8 +162,7 @@ public ConstructorDeclaration setTypeParameters(final NodeList ty * [throws exceptionsList] */ @Override - public String getDeclarationAsString( - boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { + public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { StringBuilder sb = new StringBuilder(); if (includingModifiers) { AccessSpecifier accessSpecifier = getAccessSpecifier(); @@ -259,7 +191,7 @@ public String getDeclarationAsString( /* * Returns the constructor descriptor */ - public String toDescriptor() { + public String toDescriptor() { StringBuilder sb = new StringBuilder(); sb.append('('); for (int i = 0; i < getParameters().size(); i++) { @@ -270,19 +202,19 @@ public String toDescriptor() { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ConstructorDeclaration clone() { + public ConstructorDeclaration clone() { return (ConstructorDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ConstructorDeclarationMetaModel getMetaModel() { + public ConstructorDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.constructorDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -295,30 +227,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isConstructorDeclaration() { + public boolean isConstructorDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ConstructorDeclaration asConstructorDeclaration() { + public ConstructorDeclaration asConstructorDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifConstructorDeclaration(Consumer action) { + public void ifConstructorDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedConstructorDeclaration resolve() { + public ResolvedConstructorDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedConstructorDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toConstructorDeclaration() { + public Optional toConstructorDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java index 33cc2df438..ff4434192c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java @@ -39,10 +39,8 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedEnumConstantDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -50,11 +48,7 @@ * * @author Julio Vilmar Gesser */ -public class EnumConstantDeclaration extends BodyDeclaration - implements NodeWithJavadoc, - NodeWithSimpleName, - NodeWithArguments, - Resolvable { +public class EnumConstantDeclaration extends BodyDeclaration implements NodeWithJavadoc, NodeWithSimpleName, NodeWithArguments, Resolvable { private SimpleName name; @@ -62,20 +56,16 @@ public class EnumConstantDeclaration extends BodyDeclaration> classBody; - public EnumConstantDeclaration() { + public EnumConstantDeclaration() { this(null, new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>()); } - public EnumConstantDeclaration(String name) { + public EnumConstantDeclaration(String name) { this(null, new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>()); } @AllFieldsConstructor - public EnumConstantDeclaration( - NodeList annotations, - SimpleName name, - NodeList arguments, - NodeList> classBody) { + public EnumConstantDeclaration(NodeList annotations, SimpleName name, NodeList arguments, NodeList> classBody) { this(null, annotations, name, arguments, classBody); } @@ -83,12 +73,7 @@ public EnumConstantDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public EnumConstantDeclaration( - TokenRange tokenRange, - NodeList annotations, - SimpleName name, - NodeList arguments, - NodeList> classBody) { + public EnumConstantDeclaration(TokenRange tokenRange, NodeList annotations, SimpleName name, NodeList arguments, NodeList> classBody) { super(tokenRange, annotations); setName(name); setArguments(arguments); @@ -98,65 +83,68 @@ public EnumConstantDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getArguments() { + public NodeList getArguments() { return arguments; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList> getClassBody() { + public NodeList> getClassBody() { return classBody; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnumConstantDeclaration setArguments(final NodeList arguments) { + public EnumConstantDeclaration setArguments(final NodeList arguments) { assertNotNull(arguments); if (arguments == this.arguments) { return this; } notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments); - if (this.arguments != null) this.arguments.setParentNode(null); + if (this.arguments != null) + this.arguments.setParentNode(null); this.arguments = arguments; setAsParentNodeOf(arguments); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnumConstantDeclaration setClassBody(final NodeList> classBody) { + public EnumConstantDeclaration setClassBody(final NodeList> classBody) { assertNotNull(classBody); if (classBody == this.classBody) { return this; } notifyPropertyChange(ObservableProperty.CLASS_BODY, this.classBody, classBody); - if (this.classBody != null) this.classBody.setParentNode(null); + if (this.classBody != null) + this.classBody.setParentNode(null); this.classBody = classBody; setAsParentNodeOf(classBody); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnumConstantDeclaration setName(final SimpleName name) { + public EnumConstantDeclaration setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -164,7 +152,7 @@ public EnumConstantDeclaration setName(final SimpleName name) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -185,19 +173,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public EnumConstantDeclaration clone() { + public EnumConstantDeclaration clone() { return (EnumConstantDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public EnumConstantDeclarationMetaModel getMetaModel() { + public EnumConstantDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.enumConstantDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -222,30 +210,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnumConstantDeclaration() { + public boolean isEnumConstantDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnumConstantDeclaration asEnumConstantDeclaration() { + public EnumConstantDeclaration asEnumConstantDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnumConstantDeclaration(Consumer action) { + public void ifEnumConstantDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedEnumConstantDeclaration resolve() { + public ResolvedEnumConstantDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedEnumConstantDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnumConstantDeclaration() { + public Optional toEnumConstantDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java index 4bea90a088..a173275af4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java @@ -34,10 +34,8 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedEnumDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNonEmpty; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -46,43 +44,22 @@ * * @author Julio Vilmar Gesser */ -public class EnumDeclaration extends TypeDeclaration - implements NodeWithImplements, Resolvable { +public class EnumDeclaration extends TypeDeclaration implements NodeWithImplements, Resolvable { private NodeList implementedTypes; private NodeList entries; - public EnumDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new SimpleName(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>()); + public EnumDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>()); } - public EnumDeclaration(NodeList modifiers, String name) { - this( - null, - modifiers, - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new NodeList<>()); + public EnumDeclaration(NodeList modifiers, String name) { + this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>()); } @AllFieldsConstructor - public EnumDeclaration( - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList implementedTypes, - NodeList entries, - NodeList> members) { + public EnumDeclaration(NodeList modifiers, NodeList annotations, SimpleName name, NodeList implementedTypes, NodeList entries, NodeList> members) { this(null, modifiers, annotations, name, implementedTypes, entries, members); } @@ -90,14 +67,7 @@ public EnumDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public EnumDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList implementedTypes, - NodeList entries, - NodeList> members) { + public EnumDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList implementedTypes, NodeList entries, NodeList> members) { super(tokenRange, modifiers, annotations, name, members); setImplementedTypes(implementedTypes); setEntries(entries); @@ -106,67 +76,69 @@ public EnumDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getEntries() { + public NodeList getEntries() { return entries; } - public EnumConstantDeclaration getEntry(int i) { + public EnumConstantDeclaration getEntry(int i) { return getEntries().get(i); } - public EnumDeclaration setEntry(int i, EnumConstantDeclaration element) { + public EnumDeclaration setEntry(int i, EnumConstantDeclaration element) { getEntries().set(i, element); return this; } - public EnumDeclaration addEntry(EnumConstantDeclaration element) { + public EnumDeclaration addEntry(EnumConstantDeclaration element) { getEntries().add(element); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getImplementedTypes() { + public NodeList getImplementedTypes() { return implementedTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnumDeclaration setEntries(final NodeList entries) { + public EnumDeclaration setEntries(final NodeList entries) { assertNotNull(entries); if (entries == this.entries) { return this; } notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries); - if (this.entries != null) this.entries.setParentNode(null); + if (this.entries != null) + this.entries.setParentNode(null); this.entries = entries; setAsParentNodeOf(entries); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnumDeclaration setImplementedTypes(final NodeList implementedTypes) { + public EnumDeclaration setImplementedTypes(final NodeList implementedTypes) { assertNotNull(implementedTypes); if (implementedTypes == this.implementedTypes) { return this; } notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes); - if (this.implementedTypes != null) this.implementedTypes.setParentNode(null); + if (this.implementedTypes != null) + this.implementedTypes.setParentNode(null); this.implementedTypes = implementedTypes; setAsParentNodeOf(implementedTypes); return this; } - public EnumConstantDeclaration addEnumConstant(String name) { + public EnumConstantDeclaration addEnumConstant(String name) { assertNonEmpty(name); EnumConstantDeclaration enumConstant = new EnumConstantDeclaration(name); getEntries().add(enumConstant); @@ -175,7 +147,7 @@ public EnumConstantDeclaration addEnumConstant(String name) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -196,19 +168,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public EnumDeclaration clone() { + public EnumDeclaration clone() { return (EnumDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public EnumDeclarationMetaModel getMetaModel() { + public EnumDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.enumDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -229,30 +201,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnumDeclaration() { + public boolean isEnumDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnumDeclaration asEnumDeclaration() { + public EnumDeclaration asEnumDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnumDeclaration(Consumer action) { + public void ifEnumDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedEnumDeclaration resolve() { + public ResolvedEnumDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedEnumDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnumDeclaration() { + public Optional toEnumDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java index ac186c1350..1a03f26988 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java @@ -20,13 +20,11 @@ */ package com.github.javaparser.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.ast.NodeList.nodeList; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.Modifier.Keyword; @@ -62,36 +60,27 @@ * * @author Julio Vilmar Gesser */ -public class FieldDeclaration extends BodyDeclaration - implements NodeWithJavadoc, - NodeWithVariables, - NodeWithAccessModifiers, - NodeWithStaticModifier, - NodeWithFinalModifier, - Resolvable { +public class FieldDeclaration extends BodyDeclaration implements NodeWithJavadoc, NodeWithVariables, NodeWithAccessModifiers, NodeWithStaticModifier, NodeWithFinalModifier, Resolvable { private NodeList modifiers; @NonEmptyProperty private NodeList variables; - public FieldDeclaration() { + public FieldDeclaration() { this(null, new NodeList<>(), new NodeList<>(), new NodeList<>()); } - public FieldDeclaration(NodeList modifiers, VariableDeclarator variable) { + public FieldDeclaration(NodeList modifiers, VariableDeclarator variable) { this(null, modifiers, new NodeList<>(), nodeList(variable)); } - public FieldDeclaration(NodeList modifiers, NodeList variables) { + public FieldDeclaration(NodeList modifiers, NodeList variables) { this(null, modifiers, new NodeList<>(), variables); } @AllFieldsConstructor - public FieldDeclaration( - NodeList modifiers, - NodeList annotations, - NodeList variables) { + public FieldDeclaration(NodeList modifiers, NodeList annotations, NodeList variables) { this(null, modifiers, annotations, variables); } @@ -99,11 +88,7 @@ public FieldDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public FieldDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList variables) { + public FieldDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList variables) { super(tokenRange, annotations); setModifiers(modifiers); setVariables(variables); @@ -117,19 +102,19 @@ public FieldDeclaration( * @param type type * @param name field name */ - public FieldDeclaration(NodeList modifiers, Type type, String name) { + public FieldDeclaration(NodeList modifiers, Type type, String name) { this(assertNotNull(modifiers), new VariableDeclarator(type, assertNotNull(name))); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -140,36 +125,38 @@ public void accept(final VoidVisitor v, final A arg) { * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getVariables() { + public NodeList getVariables() { return variables; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldDeclaration setModifiers(final NodeList modifiers) { + public FieldDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldDeclaration setVariables(final NodeList variables) { + public FieldDeclaration setVariables(final NodeList variables) { assertNotNull(variables); if (variables == this.variables) { return this; } notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables); - if (this.variables != null) this.variables.setParentNode(null); + if (this.variables != null) + this.variables.setParentNode(null); this.variables = variables; setAsParentNodeOf(variables); return this; @@ -183,21 +170,18 @@ public FieldDeclaration setVariables(final NodeList variable * @throws IllegalStateException if there is more than 1 variable identifier or if this field isn't attached to a * class or enum */ - public MethodDeclaration createGetter() { + public MethodDeclaration createGetter() { if (getVariables().size() != 1) throw new IllegalStateException("You can use this only when the field declares only 1 variable name"); Optional parentClass = findAncestor(ClassOrInterfaceDeclaration.class); Optional parentEnum = findAncestor(EnumDeclaration.class); - if (!(parentClass.isPresent() || parentEnum.isPresent()) - || (parentClass.isPresent() && parentClass.get().isInterface())) + if (!(parentClass.isPresent() || parentEnum.isPresent()) || (parentClass.isPresent() && parentClass.get().isInterface())) throw new IllegalStateException("You can use this only when the field is attached to a class or an enum"); VariableDeclarator variable = getVariable(0); String fieldName = variable.getNameAsString(); String fieldNameUpper = fieldName.toUpperCase().charAt(0) + fieldName.substring(1); final MethodDeclaration getter; - getter = parentClass - .map(clazz -> clazz.addMethod("get" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)) - .orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)); + getter = parentClass.map(clazz -> clazz.addMethod("get" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)); getter.setType(variable.getType()); BlockStmt blockStmt = new BlockStmt(); getter.setBody(blockStmt); @@ -213,43 +197,39 @@ public MethodDeclaration createGetter() { * @throws IllegalStateException if there is more than 1 variable identifier or if this field isn't attached to a * class or enum */ - public MethodDeclaration createSetter() { + public MethodDeclaration createSetter() { if (getVariables().size() != 1) throw new IllegalStateException("You can use this only when the field declares only 1 variable name"); Optional parentClass = findAncestor(ClassOrInterfaceDeclaration.class); Optional parentEnum = findAncestor(EnumDeclaration.class); - if (!(parentClass.isPresent() || parentEnum.isPresent()) - || (parentClass.isPresent() && parentClass.get().isInterface())) + if (!(parentClass.isPresent() || parentEnum.isPresent()) || (parentClass.isPresent() && parentClass.get().isInterface())) throw new IllegalStateException("You can use this only when the field is attached to a class or an enum"); VariableDeclarator variable = getVariable(0); String fieldName = variable.getNameAsString(); String fieldNameUpper = fieldName.toUpperCase().charAt(0) + fieldName.substring(1); final MethodDeclaration setter; - setter = parentClass - .map(clazz -> clazz.addMethod("set" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)) - .orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)); + setter = parentClass.map(clazz -> clazz.addMethod("set" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, Modifier.DefaultKeyword.PUBLIC)); setter.setType(new VoidType()); setter.getParameters().add(new Parameter(variable.getType(), fieldName)); BlockStmt blockStmt2 = new BlockStmt(); setter.setBody(blockStmt2); - blockStmt2.addStatement( - new AssignExpr(new NameExpr("this." + fieldName), new NameExpr(fieldName), Operator.ASSIGN)); + blockStmt2.addStatement(new AssignExpr(new NameExpr("this." + fieldName), new NameExpr(fieldName), Operator.ASSIGN)); return setter; } - public boolean isTransient() { + public boolean isTransient() { return hasModifier(Modifier.DefaultKeyword.TRANSIENT); } - public boolean isVolatile() { + public boolean isVolatile() { return hasModifier(Modifier.DefaultKeyword.VOLATILE); } - public FieldDeclaration setTransient(boolean set) { + public FieldDeclaration setTransient(boolean set) { return setModifier(Modifier.DefaultKeyword.TRANSIENT, set); } - public FieldDeclaration setVolatile(boolean set) { + public FieldDeclaration setVolatile(boolean set) { return setModifier(Modifier.DefaultKeyword.VOLATILE, set); } @@ -257,7 +237,7 @@ public FieldDeclaration setVolatile(boolean set) { * Every field declaration in the body of an interface is implicitly public, static, and final. */ @Override - public boolean isStatic() { + public boolean isStatic() { return hasModifier(STATIC) || isDeclaredInInterface(); } @@ -265,7 +245,7 @@ public boolean isStatic() { * Every field declaration in the body of an interface is implicitly public, static, and final. */ @Override - public boolean isFinal() { + public boolean isFinal() { return hasModifier(FINAL) || isDeclaredInInterface(); } @@ -273,7 +253,7 @@ public boolean isFinal() { * Every field declaration in the body of an interface is implicitly public, static, and final. */ @Override - public boolean isPublic() { + public boolean isPublic() { return hasModifier(PUBLIC) || isDeclaredInInterface(); } @@ -287,7 +267,7 @@ private boolean isDeclaredInInterface() { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -308,19 +288,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public FieldDeclaration clone() { + public FieldDeclaration clone() { return (FieldDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public FieldDeclarationMetaModel getMetaModel() { + public FieldDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.fieldDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -341,30 +321,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isFieldDeclaration() { + public boolean isFieldDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public FieldDeclaration asFieldDeclaration() { + public FieldDeclaration asFieldDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifFieldDeclaration(Consumer action) { + public void ifFieldDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedFieldDeclaration resolve() { + public ResolvedFieldDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedFieldDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toFieldDeclaration() { + public Optional toFieldDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java index 52dad070d8..f57d9fc733 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.InitializerDeclarationMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -44,19 +42,18 @@ * * @author Julio Vilmar Gesser */ -public class InitializerDeclaration extends BodyDeclaration - implements NodeWithJavadoc, NodeWithBlockStmt { +public class InitializerDeclaration extends BodyDeclaration implements NodeWithJavadoc, NodeWithBlockStmt { private boolean isStatic; private BlockStmt body; - public InitializerDeclaration() { + public InitializerDeclaration() { this(null, false, new BlockStmt()); } @AllFieldsConstructor - public InitializerDeclaration(boolean isStatic, BlockStmt body) { + public InitializerDeclaration(boolean isStatic, BlockStmt body) { this(null, isStatic, body); } @@ -64,7 +61,7 @@ public InitializerDeclaration(boolean isStatic, BlockStmt body) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public InitializerDeclaration(TokenRange tokenRange, boolean isStatic, BlockStmt body) { + public InitializerDeclaration(TokenRange tokenRange, boolean isStatic, BlockStmt body) { super(tokenRange); setStatic(isStatic); setBody(body); @@ -73,41 +70,42 @@ public InitializerDeclaration(TokenRange tokenRange, boolean isStatic, BlockStmt @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getBody() { + public BlockStmt getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isStatic() { + public boolean isStatic() { return isStatic; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public InitializerDeclaration setBody(final BlockStmt body) { + public InitializerDeclaration setBody(final BlockStmt body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public InitializerDeclaration setStatic(final boolean isStatic) { + public InitializerDeclaration setStatic(final boolean isStatic) { if (isStatic == this.isStatic) { return this; } @@ -118,19 +116,19 @@ public InitializerDeclaration setStatic(final boolean isStatic) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public InitializerDeclaration clone() { + public InitializerDeclaration clone() { return (InitializerDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public InitializerDeclarationMetaModel getMetaModel() { + public InitializerDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.initializerDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -143,25 +141,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isInitializerDeclaration() { + public boolean isInitializerDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public InitializerDeclaration asInitializerDeclaration() { + public InitializerDeclaration asInitializerDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifInitializerDeclaration(Consumer action) { + public void ifInitializerDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toInitializerDeclaration() { + public Optional toInitializerDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java index 5e4dead376..627dd9b7af 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java @@ -20,18 +20,17 @@ */ package com.github.javaparser.ast.body; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Arrays; import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.Modifier.Keyword; import com.github.javaparser.ast.expr.AnnotationExpr; import com.github.javaparser.ast.expr.SimpleName; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.*; import com.github.javaparser.ast.nodeTypes.modifiers.*; import com.github.javaparser.ast.observer.ObservableProperty; @@ -58,110 +57,35 @@ * * @author Julio Vilmar Gesser */ -public class MethodDeclaration extends CallableDeclaration - implements NodeWithType, - NodeWithOptionalBlockStmt, - NodeWithJavadoc, - NodeWithDeclaration, - NodeWithSimpleName, - NodeWithParameters, - NodeWithThrownExceptions, - NodeWithTypeParameters, - NodeWithAccessModifiers, - NodeWithAbstractModifier, - NodeWithStaticModifier, - NodeWithFinalModifier, - NodeWithStrictfpModifier, - Resolvable { +public class MethodDeclaration extends CallableDeclaration implements NodeWithType, NodeWithOptionalBlockStmt, NodeWithJavadoc, NodeWithDeclaration, NodeWithSimpleName, NodeWithParameters, NodeWithThrownExceptions, NodeWithTypeParameters, NodeWithAccessModifiers, NodeWithAbstractModifier, NodeWithStaticModifier, NodeWithFinalModifier, NodeWithStrictfpModifier, Resolvable { private Type type; @OptionalProperty private BlockStmt body; - public MethodDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new ClassOrInterfaceType(), - new SimpleName(), - new NodeList<>(), - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); - } - - public MethodDeclaration(final NodeList modifiers, final Type type, final String name) { - this( - null, - modifiers, - new NodeList<>(), - new NodeList<>(), - type, - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); - } - - public MethodDeclaration( - final NodeList modifiers, - final String name, - final Type type, - final NodeList parameters) { - this( - null, - modifiers, - new NodeList<>(), - new NodeList<>(), - type, - new SimpleName(name), - parameters, - new NodeList<>(), - new BlockStmt(), - null, new NodeList<>()); - } - - public MethodDeclaration( - final NodeList modifiers, - final NodeList annotations, - final NodeList typeParameters, - final Type type, - final SimpleName name, - final NodeList parameters, - final NodeList thrownExceptions, - final BlockStmt body) { + public MethodDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new ClassOrInterfaceType(), new SimpleName(), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>()); + } + + public MethodDeclaration(final NodeList modifiers, final Type type, final String name) { + this(null, modifiers, new NodeList<>(), new NodeList<>(), type, new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>()); + } + + public MethodDeclaration(final NodeList modifiers, final String name, final Type type, final NodeList parameters) { + this(null, modifiers, new NodeList<>(), new NodeList<>(), type, new SimpleName(name), parameters, new NodeList<>(), new BlockStmt(), null, new NodeList<>()); + } + + public MethodDeclaration(final NodeList modifiers, final NodeList annotations, final NodeList typeParameters, final Type type, final SimpleName name, final NodeList parameters, final NodeList thrownExceptions, final BlockStmt body) { this(null, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, null, new NodeList<>()); } @AllFieldsConstructor - public MethodDeclaration( - final NodeList modifiers, - final NodeList annotations, - final NodeList typeParameters, - final Type type, - final SimpleName name, - final NodeList parameters, - final NodeList thrownExceptions, - final BlockStmt body, - ReceiverParameter receiverParameter, final NodeList contracts) { - this( - null, - modifiers, - annotations, - typeParameters, - type, - name, - parameters, - thrownExceptions, - body, - receiverParameter, contracts); - } - - public MethodDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, Type type, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) { + public MethodDeclaration(final NodeList modifiers, final NodeList annotations, final NodeList typeParameters, final Type type, final SimpleName name, final NodeList parameters, final NodeList thrownExceptions, final BlockStmt body, ReceiverParameter receiverParameter, final NodeList contracts) { + this(null, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, contracts); + } + + public MethodDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, Type type, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) { this(tokenRange, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, new NodeList<>()); } @@ -169,26 +93,8 @@ public MethodDeclaration(TokenRange tokenRange, NodeList modifiers, No * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public MethodDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList typeParameters, - Type type, - SimpleName name, - NodeList parameters, - NodeList thrownExceptions, - BlockStmt body, - ReceiverParameter receiverParameter, NodeList contracts) { - super( - tokenRange, - modifiers, - annotations, - typeParameters, - name, - parameters, - thrownExceptions, - receiverParameter, contracts); + public MethodDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList typeParameters, Type type, SimpleName name, NodeList parameters, NodeList thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList contracts) { + super(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts); setType(type); setBody(body); customInitialization(); @@ -196,18 +102,18 @@ public MethodDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getBody() { + public Optional getBody() { return Optional.ofNullable(body); } @@ -218,57 +124,59 @@ public Optional getBody() { * @return this, the MethodDeclaration */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodDeclaration setBody(final BlockStmt body) { + public MethodDeclaration setBody(final BlockStmt body) { if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodDeclaration setType(final Type type) { + public MethodDeclaration setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; } @Override - public MethodDeclaration setModifiers(final NodeList modifiers) { + public MethodDeclaration setModifiers(final NodeList modifiers) { return super.setModifiers(modifiers); } @Override - public MethodDeclaration setName(final SimpleName name) { + public MethodDeclaration setName(final SimpleName name) { return super.setName(name); } @Override - public MethodDeclaration setParameters(final NodeList parameters) { + public MethodDeclaration setParameters(final NodeList parameters) { return super.setParameters(parameters); } @Override - public MethodDeclaration setThrownExceptions(final NodeList thrownExceptions) { + public MethodDeclaration setThrownExceptions(final NodeList thrownExceptions) { return super.setThrownExceptions(thrownExceptions); } @Override - public MethodDeclaration setTypeParameters(final NodeList typeParameters) { + public MethodDeclaration setTypeParameters(final NodeList typeParameters) { return super.setTypeParameters(typeParameters); } @@ -282,8 +190,7 @@ public MethodDeclaration setTypeParameters(final NodeList typePar * @return method declaration as String */ @Override - public String getDeclarationAsString( - boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { + public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) { StringBuilder sb = new StringBuilder(); if (includingModifiers) { AccessSpecifier accessSpecifier = getAccessSpecifier(); @@ -335,7 +242,7 @@ public String getDeclarationAsString( * is {@code (IDLjava/lang/Thread;)Ljava/lang/Object;} * Note that the internal forms of the binary names of Thread and Object are used. */ - public String toDescriptor() { + public String toDescriptor() { StringBuilder sb = new StringBuilder(); sb.append("("); for (int i = 0; i < getParameters().size(); i++) { @@ -352,7 +259,7 @@ public String toDescriptor() { * https://docs.oracle.com/javase/specs/jls/se9/html/jls-9.html#jls-9.4 */ @Override - public boolean isPublic() { + public boolean isPublic() { return hasModifier(PUBLIC) || isImplicitlyPublic(); } @@ -365,7 +272,7 @@ private boolean isImplicitlyPublic() { * https://docs.oracle.com/javase/specs/jls/se9/html/jls-9.html#jls-9.4 */ @Override - public boolean isAbstract() { + public boolean isAbstract() { return super.isAbstract() || isImplicitlyAbstract(); } @@ -373,33 +280,33 @@ private boolean isImplicitlyAbstract() { return hasParentNode() && getParentNode().get() instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) getParentNode().get()).isInterface() && Arrays.asList(STATIC, DEFAULT, PRIVATE).stream().noneMatch(modifier -> hasModifier(modifier)); } - public boolean isNative() { + public boolean isNative() { return hasModifier(Modifier.DefaultKeyword.NATIVE); } - public boolean isSynchronized() { + public boolean isSynchronized() { return hasModifier(Modifier.DefaultKeyword.SYNCHRONIZED); } - public boolean isDefault() { + public boolean isDefault() { return hasModifier(DEFAULT); } - public MethodDeclaration setNative(boolean set) { + public MethodDeclaration setNative(boolean set) { return setModifier(Modifier.DefaultKeyword.NATIVE, set); } - public MethodDeclaration setSynchronized(boolean set) { + public MethodDeclaration setSynchronized(boolean set) { return setModifier(Modifier.DefaultKeyword.SYNCHRONIZED, set); } - public MethodDeclaration setDefault(boolean set) { + public MethodDeclaration setDefault(boolean set) { return setModifier(DEFAULT, set); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -413,25 +320,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public MethodDeclaration removeBody() { + public MethodDeclaration removeBody() { return setBody((BlockStmt) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public MethodDeclaration clone() { + public MethodDeclaration clone() { return (MethodDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public MethodDeclarationMetaModel getMetaModel() { + public MethodDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.methodDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -450,30 +357,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodDeclaration() { + public boolean isMethodDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodDeclaration asMethodDeclaration() { + public MethodDeclaration asMethodDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodDeclaration(Consumer action) { + public void ifMethodDeclaration(Consumer action) { action.accept(this); } @Override - public ResolvedMethodDeclaration resolve() { + public ResolvedMethodDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedMethodDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodDeclaration() { + public Optional toMethodDeclaration() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java index fc3b16b88e..1271f23ef8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java @@ -38,7 +38,6 @@ import com.github.javaparser.metamodel.ParameterMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedParameterDeclaration; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -52,12 +51,7 @@ * * @author Julio Vilmar Gesser */ -public class Parameter extends Node - implements NodeWithType, - NodeWithAnnotations, - NodeWithSimpleName, - NodeWithFinalModifier, - Resolvable { +public class Parameter extends Node implements NodeWithType, NodeWithAnnotations, NodeWithSimpleName, NodeWithFinalModifier, Resolvable { private Type type; @@ -71,18 +65,11 @@ public class Parameter extends Node private SimpleName name; - public Parameter() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new ClassOrInterfaceType(), - false, - new NodeList<>(), - new SimpleName()); + public Parameter() { + this(null, new NodeList<>(), new NodeList<>(), new ClassOrInterfaceType(), false, new NodeList<>(), new SimpleName()); } - public Parameter(Type type, SimpleName name) { + public Parameter(Type type, SimpleName name) { this(null, new NodeList<>(), new NodeList<>(), type, false, new NodeList<>(), name); } @@ -92,22 +79,16 @@ public Parameter(Type type, SimpleName name) { * @param type type of the parameter * @param name name of the parameter */ - public Parameter(Type type, String name) { + public Parameter(Type type, String name) { this(null, new NodeList<>(), new NodeList<>(), type, false, new NodeList<>(), new SimpleName(name)); } - public Parameter(NodeList modifiers, Type type, SimpleName name) { + public Parameter(NodeList modifiers, Type type, SimpleName name) { this(null, modifiers, new NodeList<>(), type, false, new NodeList<>(), name); } @AllFieldsConstructor - public Parameter( - NodeList modifiers, - NodeList annotations, - Type type, - boolean isVarArgs, - NodeList varArgsAnnotations, - SimpleName name) { + public Parameter(NodeList modifiers, NodeList annotations, Type type, boolean isVarArgs, NodeList varArgsAnnotations, SimpleName name) { this(null, modifiers, annotations, type, isVarArgs, varArgsAnnotations, name); } @@ -115,14 +96,7 @@ public Parameter( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Parameter( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - Type type, - boolean isVarArgs, - NodeList varArgsAnnotations, - SimpleName name) { + public Parameter(TokenRange tokenRange, NodeList modifiers, NodeList annotations, Type type, boolean isVarArgs, NodeList varArgsAnnotations, SimpleName name) { super(tokenRange); setModifiers(modifiers); setAnnotations(annotations); @@ -135,41 +109,42 @@ public Parameter( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isVarArgs() { + public boolean isVarArgs() { return isVarArgs; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setType(final Type type) { + public Parameter setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setVarArgs(final boolean isVarArgs) { + public Parameter setVarArgs(final boolean isVarArgs) { if (isVarArgs == this.isVarArgs) { return this; } @@ -182,12 +157,12 @@ public Parameter setVarArgs(final boolean isVarArgs) { * @return the list returned could be immutable (in that case it will be empty) */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @@ -198,7 +173,7 @@ public SimpleName getName() { * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @@ -207,39 +182,42 @@ public NodeList getModifiers() { * so please avoid passing null */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setAnnotations(final NodeList annotations) { + public Parameter setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setName(final SimpleName name) { + public Parameter setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setModifiers(final NodeList modifiers) { + public Parameter setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; @@ -247,7 +225,7 @@ public Parameter setModifiers(final NodeList modifiers) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -273,18 +251,19 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getVarArgsAnnotations() { + public NodeList getVarArgsAnnotations() { return varArgsAnnotations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter setVarArgsAnnotations(final NodeList varArgsAnnotations) { + public Parameter setVarArgsAnnotations(final NodeList varArgsAnnotations) { assertNotNull(varArgsAnnotations); if (varArgsAnnotations == this.varArgsAnnotations) { return this; } notifyPropertyChange(ObservableProperty.VAR_ARGS_ANNOTATIONS, this.varArgsAnnotations, varArgsAnnotations); - if (this.varArgsAnnotations != null) this.varArgsAnnotations.setParentNode(null); + if (this.varArgsAnnotations != null) + this.varArgsAnnotations.setParentNode(null); this.varArgsAnnotations = varArgsAnnotations; setAsParentNodeOf(varArgsAnnotations); return this; @@ -292,19 +271,19 @@ public Parameter setVarArgsAnnotations(final NodeList varArgsAnn @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Parameter clone() { + public Parameter clone() { return (Parameter) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ParameterMetaModel getMetaModel() { + public ParameterMetaModel getMetaModel() { return JavaParserMetaModel.parameterMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -338,7 +317,7 @@ public boolean replace(Node node, Node replacementNode) { } @Override - public ResolvedParameterDeclaration resolve() { + public ResolvedParameterDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedParameterDeclaration.class); } @@ -352,7 +331,7 @@ public ResolvedParameterDeclaration resolve() { * @return true if the node parameter is explicitly final (keyword attached) or implicitly final (e.g. parameters to a record) */ @Override - public boolean isFinal() { + public boolean isFinal() { // RecordDeclaration-specific code if (getParentNode().isPresent()) { Node parentNode = getParentNode().get(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java index 4f83b674b6..8ad5ff85ed 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java @@ -38,7 +38,6 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.ReceiverParameterMetaModel; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -49,10 +48,7 @@ * * @author Julio Vilmar Gesser */ -public class ReceiverParameter extends Node - implements NodeWithType, - NodeWithAnnotations, - NodeWithName { +public class ReceiverParameter extends Node implements NodeWithType, NodeWithAnnotations, NodeWithName { private Type type; @@ -60,11 +56,11 @@ public class ReceiverParameter extends Node private Name name; - public ReceiverParameter() { + public ReceiverParameter() { this(null, new NodeList<>(), new ClassOrInterfaceType(), new Name()); } - public ReceiverParameter(Type type, Name name) { + public ReceiverParameter(Type type, Name name) { this(null, new NodeList<>(), type, name); } @@ -74,12 +70,12 @@ public ReceiverParameter(Type type, Name name) { * @param type type of the parameter * @param name name of the parameter */ - public ReceiverParameter(Type type, String name) { + public ReceiverParameter(Type type, String name) { this(null, new NodeList<>(), type, new Name(name)); } @AllFieldsConstructor - public ReceiverParameter(NodeList annotations, Type type, Name name) { + public ReceiverParameter(NodeList annotations, Type type, Name name) { this(null, annotations, type, name); } @@ -87,7 +83,7 @@ public ReceiverParameter(NodeList annotations, Type type, Name n * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ReceiverParameter(TokenRange tokenRange, NodeList annotations, Type type, Name name) { + public ReceiverParameter(TokenRange tokenRange, NodeList annotations, Type type, Name name) { super(tokenRange); setAnnotations(annotations); setType(type); @@ -97,29 +93,30 @@ public ReceiverParameter(TokenRange tokenRange, NodeList annotat @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ReceiverParameter setType(final Type type) { + public ReceiverParameter setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -129,7 +126,7 @@ public ReceiverParameter setType(final Type type) { * @return the list returned could be immutable (in that case it will be empty) */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @@ -138,13 +135,14 @@ public NodeList getAnnotations() { * so please avoid passing null */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ReceiverParameter setAnnotations(final NodeList annotations) { + public ReceiverParameter setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; @@ -152,29 +150,30 @@ public ReceiverParameter setAnnotations(final NodeList annotatio @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ReceiverParameter clone() { + public ReceiverParameter clone() { return (ReceiverParameter) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ReceiverParameterMetaModel getMetaModel() { + public ReceiverParameterMetaModel getMetaModel() { return JavaParserMetaModel.receiverParameterMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ReceiverParameter setName(final Name name) { + public ReceiverParameter setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -182,7 +181,7 @@ public ReceiverParameter setName(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -197,7 +196,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java index 5fa67366cd..9942e2c8af 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java @@ -40,11 +40,9 @@ import com.github.javaparser.metamodel.RecordDeclarationMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; - import java.util.List; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList; @@ -90,12 +88,7 @@ * @see JLS 8.10 - Record Classes * @since 3.22.0 */ -public class RecordDeclaration extends TypeDeclaration - implements NodeWithParameters, - NodeWithImplements, - NodeWithTypeParameters, - NodeWithFinalModifier, - Resolvable { +public class RecordDeclaration extends TypeDeclaration implements NodeWithParameters, NodeWithImplements, NodeWithTypeParameters, NodeWithFinalModifier, Resolvable { private NodeList typeParameters; @@ -106,68 +99,24 @@ public class RecordDeclaration extends TypeDeclaration private NodeList parameters; - public RecordDeclaration() { - this( - null, - new NodeList<>(), - new NodeList<>(), - new SimpleName(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - null); + public RecordDeclaration() { + this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), null); } - public RecordDeclaration(final NodeList modifiers, final String name) { - this( - null, - modifiers, - new NodeList<>(), - new SimpleName(name), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - new NodeList<>(), - null); + public RecordDeclaration(final NodeList modifiers, final String name) { + this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), null); } @AllFieldsConstructor - public RecordDeclaration( - final NodeList modifiers, - final NodeList annotations, - final SimpleName name, - final NodeList parameters, - final NodeList typeParameters, - final NodeList implementedTypes, - final NodeList> members, - final ReceiverParameter receiverParameter) { - this( - null, - modifiers, - annotations, - name, - parameters, - typeParameters, - implementedTypes, - members, - receiverParameter); + public RecordDeclaration(final NodeList modifiers, final NodeList annotations, final SimpleName name, final NodeList parameters, final NodeList typeParameters, final NodeList implementedTypes, final NodeList> members, final ReceiverParameter receiverParameter) { + this(null, modifiers, annotations, name, parameters, typeParameters, implementedTypes, members, receiverParameter); } /** * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public RecordDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList parameters, - NodeList typeParameters, - NodeList implementedTypes, - NodeList> members, - ReceiverParameter receiverParameter) { + public RecordDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList parameters, NodeList typeParameters, NodeList implementedTypes, NodeList> members, ReceiverParameter receiverParameter) { super(tokenRange, modifiers, annotations, name, members); setParameters(parameters); setTypeParameters(typeParameters); @@ -178,47 +127,49 @@ public RecordDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getImplementedTypes() { + public NodeList getImplementedTypes() { return implementedTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypeParameters() { + public NodeList getTypeParameters() { return typeParameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordDeclaration setImplementedTypes(final NodeList implementedTypes) { + public RecordDeclaration setImplementedTypes(final NodeList implementedTypes) { assertNotNull(implementedTypes); if (implementedTypes == this.implementedTypes) { return this; } notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes); - if (this.implementedTypes != null) this.implementedTypes.setParentNode(null); + if (this.implementedTypes != null) + this.implementedTypes.setParentNode(null); this.implementedTypes = implementedTypes; setAsParentNodeOf(implementedTypes); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordDeclaration setTypeParameters(final NodeList typeParameters) { + public RecordDeclaration setTypeParameters(final NodeList typeParameters) { assertNotNull(typeParameters); if (typeParameters == this.typeParameters) { return this; } notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters); - if (this.typeParameters != null) this.typeParameters.setParentNode(null); + if (this.typeParameters != null) + this.typeParameters.setParentNode(null); this.typeParameters = typeParameters; setAsParentNodeOf(typeParameters); return this; @@ -228,13 +179,13 @@ public RecordDeclaration setTypeParameters(final NodeList typePar /** * @return is this class's parent a LocalRecordDeclarationStmt ? */ - public boolean isLocalRecordDeclaration() { + public boolean isLocalRecordDeclaration() { return getParentNode().map(p -> p instanceof LocalRecordDeclarationStmt).orElse(false); } // TODO document and remove duplication between here and com.github.javaparser.ast.body.ClassOrInterfaceDeclaration @Override - public Optional getFullyQualifiedName() { + public Optional getFullyQualifiedName() { if (isLocalRecordDeclaration()) { return Optional.empty(); } @@ -242,37 +193,37 @@ public Optional getFullyQualifiedName() { } @Override - public ResolvedReferenceTypeDeclaration resolve() { + public ResolvedReferenceTypeDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedReferenceTypeDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isRecordDeclaration() { + public boolean isRecordDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public RecordDeclaration asRecordDeclaration() { + public RecordDeclaration asRecordDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toRecordDeclaration() { + public Optional toRecordDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifRecordDeclaration(Consumer action) { + public void ifRecordDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -305,7 +256,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -338,13 +289,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public RecordDeclaration clone() { + public RecordDeclaration clone() { return (RecordDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public RecordDeclarationMetaModel getMetaModel() { + public RecordDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.recordDeclarationMetaModel; } @@ -357,42 +308,44 @@ public RecordDeclarationMetaModel getMetaModel() { * @see https://openjdk.java.net/jeps/359 */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getParameters() { + public NodeList getParameters() { return parameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordDeclaration setParameters(final NodeList parameters) { + public RecordDeclaration setParameters(final NodeList parameters) { assertNotNull(parameters); if (parameters == this.parameters) { return this; } notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters); - if (this.parameters != null) this.parameters.setParentNode(null); + if (this.parameters != null) + this.parameters.setParentNode(null); this.parameters = parameters; setAsParentNodeOf(parameters); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getReceiverParameter() { + public Optional getReceiverParameter() { return Optional.ofNullable(receiverParameter); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordDeclaration setReceiverParameter(final ReceiverParameter receiverParameter) { + public RecordDeclaration setReceiverParameter(final ReceiverParameter receiverParameter) { if (receiverParameter == this.receiverParameter) { return this; } notifyPropertyChange(ObservableProperty.RECEIVER_PARAMETER, this.receiverParameter, receiverParameter); - if (this.receiverParameter != null) this.receiverParameter.setParentNode(null); + if (this.receiverParameter != null) + this.receiverParameter.setParentNode(null); this.receiverParameter = receiverParameter; setAsParentNodeOf(receiverParameter); return this; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public RecordDeclaration removeReceiverParameter() { + public RecordDeclaration removeReceiverParameter() { return setReceiverParameter((ReceiverParameter) null); } @@ -406,7 +359,7 @@ public RecordDeclaration removeReceiverParameter() { * @return always true -- Records are always implicitly final, therefore can never not be final. */ @Override - public boolean isFinal() { + public boolean isFinal() { return true; } @@ -417,7 +370,7 @@ public boolean isFinal() { * @return True if the record declaration is nested, otherwise use the default method implementation. */ @Override - public boolean isStatic() { + public boolean isStatic() { if (getParentNode().isPresent()) { Node parentNode = getParentNode().get(); if (!(parentNode instanceof CompilationUnit)) { @@ -432,10 +385,7 @@ public boolean isStatic() { * @return Only the "compact" constructors within this record, * not "normal" constructors (which are obtainable via {@link #getConstructors()}). */ - public List getCompactConstructors() { - return unmodifiableList(getMembers().stream() - .filter(m -> m instanceof CompactConstructorDeclaration) - .map(m -> (CompactConstructorDeclaration) m) - .collect(toList())); + public List getCompactConstructors() { + return unmodifiableList(getMembers().stream().filter(m -> m instanceof CompactConstructorDeclaration).map(m -> (CompactConstructorDeclaration) m).collect(toList())); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java index 9e4496b1d9..e950abf3ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java @@ -35,11 +35,9 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.TypeDeclarationMetaModel; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; - import java.util.List; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.toList; @@ -48,13 +46,7 @@ * * @author Julio Vilmar Gesser */ -public abstract class TypeDeclaration> extends BodyDeclaration - implements NodeWithSimpleName, - NodeWithJavadoc, - NodeWithMembers, - NodeWithAccessModifiers, - NodeWithStaticModifier, - NodeWithStrictfpModifier { +public abstract class TypeDeclaration> extends BodyDeclaration implements NodeWithSimpleName, NodeWithJavadoc, NodeWithMembers, NodeWithAccessModifiers, NodeWithStaticModifier, NodeWithStrictfpModifier { private SimpleName name; @@ -62,20 +54,16 @@ public abstract class TypeDeclaration> extends Body private NodeList> members; - public TypeDeclaration() { + public TypeDeclaration() { this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>()); } - public TypeDeclaration(NodeList modifiers, String name) { + public TypeDeclaration(NodeList modifiers, String name) { this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>()); } @AllFieldsConstructor - public TypeDeclaration( - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList> members) { + public TypeDeclaration(NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members) { this(null, modifiers, annotations, name, members); } @@ -83,12 +71,7 @@ public TypeDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TypeDeclaration( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - SimpleName name, - NodeList> members) { + public TypeDeclaration(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members) { super(tokenRange, annotations); setModifiers(modifiers); setName(name); @@ -101,14 +84,14 @@ public TypeDeclaration( * * @param decl member declaration */ - public T addMember(BodyDeclaration decl) { + public T addMember(BodyDeclaration decl) { NodeList> members = getMembers(); members.add(decl); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList> getMembers() { + public NodeList> getMembers() { return members; } @@ -119,19 +102,20 @@ public NodeList> getMembers() { * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setMembers(final NodeList> members) { + public T setMembers(final NodeList> members) { assertNotNull(members); if (members == this.members) { return (T) this; } notifyPropertyChange(ObservableProperty.MEMBERS, this.members, members); - if (this.members != null) this.members.setParentNode(null); + if (this.members != null) + this.members.setParentNode(null); this.members = members; setAsParentNodeOf(members); return (T) this; @@ -139,13 +123,14 @@ public T setMembers(final NodeList> members) { @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setModifiers(final NodeList modifiers) { + public T setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return (T) this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return (T) this; @@ -153,26 +138,27 @@ public T setModifiers(final NodeList modifiers) { @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") @SuppressWarnings("unchecked") - public T setName(final SimpleName name) { + public T setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return (T) this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return (T) this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -194,19 +180,15 @@ public boolean remove(Node node) { /** * @return is this type's parent a CompilationUnit? */ - public boolean isTopLevelType() { + public boolean isTopLevelType() { return getParentNode().map(p -> p instanceof CompilationUnit).orElse(false); } /** * @return methods or constructors whose signatures match the passed signature. */ - public List> getCallablesWithSignature(CallableDeclaration.Signature signature) { - return getMembers().stream() - .filter(m -> m instanceof CallableDeclaration) - .map(m -> ((CallableDeclaration) m)) - .filter(m -> m.getSignature().equals(signature)) - .collect(toList()); + public List> getCallablesWithSignature(CallableDeclaration.Signature signature) { + return getMembers().stream().filter(m -> m instanceof CallableDeclaration).map(m -> ((CallableDeclaration) m)).filter(m -> m.getSignature().equals(signature)).collect(toList()); } /** @@ -218,41 +200,36 @@ public List> getCallablesWithSignature(CallableDeclaratio * @see com.github.javaparser.ast.stmt.LocalClassDeclarationStmt * @see com.github.javaparser.ast.stmt.LocalRecordDeclarationStmt */ - public Optional getFullyQualifiedName() { + public Optional getFullyQualifiedName() { if (isTopLevelType()) { - return findCompilationUnit().map(cu -> cu.getPackageDeclaration() - .map(pd -> pd.getNameAsString()) - .map(pkg -> pkg + "." + getNameAsString()) - .orElseGet(() -> getNameAsString())); + return findCompilationUnit().map(cu -> cu.getPackageDeclaration().map(pd -> pd.getNameAsString()).map(pkg -> pkg + "." + getNameAsString()).orElseGet(() -> getNameAsString())); } - return findAncestor(TypeDeclaration.class) - .map(td -> (TypeDeclaration) td) - .flatMap(td -> td.getFullyQualifiedName().map(fqn -> fqn + "." + getNameAsString())); + return findAncestor(TypeDeclaration.class).map(td -> (TypeDeclaration) td).flatMap(td -> td.getFullyQualifiedName().map(fqn -> fqn + "." + getNameAsString())); } /** * @return is this type's parent a TypeDeclaration? * NOTE: many people are confused over terminology. Refer to https://docs.oracle.com/javase/tutorial/java/javaOO/nested.html . */ - public boolean isNestedType() { + public boolean isNestedType() { return getParentNode().map(p -> p instanceof TypeDeclaration).orElse(false); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TypeDeclaration clone() { + public TypeDeclaration clone() { return (TypeDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TypeDeclarationMetaModel getMetaModel() { + public TypeDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.typeDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -277,25 +254,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeDeclaration() { + public boolean isTypeDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeDeclaration asTypeDeclaration() { + public TypeDeclaration asTypeDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeDeclaration(Consumer action) { + public void ifTypeDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeDeclaration() { + public Optional toTypeDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java index 80221d55e2..e3e1073c02 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java @@ -43,11 +43,9 @@ import com.github.javaparser.metamodel.VariableDeclaratorMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration; - import java.util.LinkedList; import java.util.List; import java.util.Optional; - import static com.github.javaparser.utils.Utils.assertNonEmpty; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -58,10 +56,7 @@ * * @author Julio Vilmar Gesser */ -public class VariableDeclarator extends Node - implements NodeWithType, - NodeWithSimpleName, - Resolvable { +public class VariableDeclarator extends Node implements NodeWithType, NodeWithSimpleName, Resolvable { private SimpleName name; @@ -71,19 +66,19 @@ public class VariableDeclarator extends Node private Type type; - public VariableDeclarator() { + public VariableDeclarator() { this(null, new ClassOrInterfaceType(), new SimpleName(), null); } - public VariableDeclarator(Type type, String variableName) { + public VariableDeclarator(Type type, String variableName) { this(null, type, new SimpleName(variableName), null); } - public VariableDeclarator(Type type, SimpleName name) { + public VariableDeclarator(Type type, SimpleName name) { this(null, type, name, null); } - public VariableDeclarator(Type type, String variableName, Expression initializer) { + public VariableDeclarator(Type type, String variableName, Expression initializer) { this(null, type, new SimpleName(variableName), initializer); } @@ -95,7 +90,7 @@ public VariableDeclarator(Type type, String variableName, Expression initializer * is unnecessary as the {@code =} operator is already added. */ @AllFieldsConstructor - public VariableDeclarator(Type type, SimpleName name, Expression initializer) { + public VariableDeclarator(Type type, SimpleName name, Expression initializer) { this(null, type, name, initializer); } @@ -103,7 +98,7 @@ public VariableDeclarator(Type type, SimpleName name, Expression initializer) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public VariableDeclarator(TokenRange tokenRange, Type type, SimpleName name, Expression initializer) { + public VariableDeclarator(TokenRange tokenRange, Type type, SimpleName name, Expression initializer) { super(tokenRange); setType(type); setName(name); @@ -118,13 +113,11 @@ protected void customInitialization() { register(new AstObserverAdapter() { @Override - public void propertyChange( - Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { if (property == ObservableProperty.TYPE) { VariableDeclarator vd = VariableDeclarator.this; if (vd.getParentNode().isPresent() && vd.getParentNode().get() instanceof NodeWithVariables) { - NodeWithVariables nodeWithVariables = - (NodeWithVariables) vd.getParentNode().get(); + NodeWithVariables nodeWithVariables = (NodeWithVariables) vd.getParentNode().get(); // We calculate the value the property will assume after the change will be completed Optional currentMaxCommonType = nodeWithVariables.getMaximumCommonType(); List types = new LinkedList<>(); @@ -137,11 +130,7 @@ public void propertyChange( } } Optional newMaxCommonType = NodeWithVariables.calculateMaximumCommonType(types); - ((Node) nodeWithVariables) - .notifyPropertyChange( - ObservableProperty.MAXIMUM_COMMON_TYPE, - currentMaxCommonType.orElse(null), - newMaxCommonType.orElse(null)); + ((Node) nodeWithVariables).notifyPropertyChange(ObservableProperty.MAXIMUM_COMMON_TYPE, currentMaxCommonType.orElse(null), newMaxCommonType.orElse(null)); } } } @@ -150,34 +139,35 @@ public void propertyChange( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getInitializer() { + public Optional getInitializer() { return Optional.ofNullable(initializer); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarator setName(final SimpleName name) { + public VariableDeclarator setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -190,12 +180,13 @@ public VariableDeclarator setName(final SimpleName name) { * @return this, the VariableDeclarator */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarator setInitializer(final Expression initializer) { + public VariableDeclarator setInitializer(final Expression initializer) { if (initializer == this.initializer) { return this; } notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer); - if (this.initializer != null) this.initializer.setParentNode(null); + if (this.initializer != null) + this.initializer.setParentNode(null); this.initializer = initializer; setAsParentNodeOf(initializer); return this; @@ -207,23 +198,24 @@ public VariableDeclarator setInitializer(final Expression initializer) { * @param init the initializer expression, can be null * @return this, the VariableDeclarator */ - public VariableDeclarator setInitializer(String init) { + public VariableDeclarator setInitializer(String init) { return setInitializer(new NameExpr(assertNonEmpty(init))); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarator setType(final Type type) { + public VariableDeclarator setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -231,7 +223,7 @@ public VariableDeclarator setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -245,25 +237,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public VariableDeclarator removeInitializer() { + public VariableDeclarator removeInitializer() { return setInitializer((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public VariableDeclarator clone() { + public VariableDeclarator clone() { return (VariableDeclarator) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public VariableDeclaratorMetaModel getMetaModel() { + public VariableDeclaratorMetaModel getMetaModel() { return JavaParserMetaModel.variableDeclaratorMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -285,7 +277,7 @@ public boolean replace(Node node, Node replacementNode) { } @Override - public ResolvedValueDeclaration resolve() { + public ResolvedValueDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedValueDeclaration.class); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java index b8eafb19d4..5e7ad18fdc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java @@ -41,14 +41,14 @@ * * @author Julio Vilmar Gesser */ -public class BlockComment extends Comment { +public class BlockComment extends Comment { - public BlockComment() { + public BlockComment() { this(null, "empty"); } @AllFieldsConstructor - public BlockComment(String content) { + public BlockComment(String content) { this(null, content); } @@ -56,66 +56,66 @@ public BlockComment(String content) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BlockComment(TokenRange tokenRange, String content) { + public BlockComment(TokenRange tokenRange, String content) { super(tokenRange, content); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BlockComment clone() { + public BlockComment clone() { return (BlockComment) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BlockCommentMetaModel getMetaModel() { + public BlockCommentMetaModel getMetaModel() { return JavaParserMetaModel.blockCommentMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBlockComment() { + public boolean isBlockComment() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BlockComment asBlockComment() { + public BlockComment asBlockComment() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBlockComment(Consumer action) { + public void ifBlockComment(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBlockComment() { + public Optional toBlockComment() { return Optional.of(this); } @Override - public String getHeader() { + public String getHeader() { return "/*"; } @Override - public String getFooter() { + public String getFooter() { return "*/"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java index d9b7fc0d86..549929c1f1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java @@ -22,7 +22,6 @@ import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -51,7 +50,7 @@ public abstract class Comment extends Node { private Node commentedNode; @AllFieldsConstructor - public Comment(String content) { + public Comment(String content) { this(null, content); } @@ -59,7 +58,7 @@ public Comment(String content) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Comment(TokenRange tokenRange, String content) { + public Comment(TokenRange tokenRange, String content) { super(tokenRange); setContent(content); customInitialization(); @@ -71,7 +70,7 @@ public Comment(TokenRange tokenRange, String content) { * @return text of the comment */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public String getContent() { + public String getContent() { return content; } @@ -81,7 +80,7 @@ public String getContent() { * @param content the text of the comment to set */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Comment setContent(final String content) { + public Comment setContent(final String content) { assertNotNull(content); if (content == this.content) { return this; @@ -92,17 +91,16 @@ public Comment setContent(final String content) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLineComment() { + public boolean isLineComment() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LineComment asLineComment() { - throw new IllegalStateException( - f("%s is not LineComment, it is %s", this, this.getClass().getSimpleName())); + public LineComment asLineComment() { + throw new IllegalStateException(f("%s is not LineComment, it is %s", this, this.getClass().getSimpleName())); } - public Optional getCommentedNode() { + public Optional getCommentedNode() { return Optional.ofNullable(this.commentedNode); } @@ -112,7 +110,7 @@ public Optional getCommentedNode() { * @param commentedNode the commentedNode, can be null * @return this, the Comment */ - public Comment setCommentedNode(Node commentedNode) { + public Comment setCommentedNode(Node commentedNode) { notifyPropertyChange(ObservableProperty.COMMENTED_NODE, this.commentedNode, commentedNode); if (commentedNode == null) { this.commentedNode = null; @@ -128,12 +126,12 @@ public Comment setCommentedNode(Node commentedNode) { return this; } - public boolean isOrphan() { + public boolean isOrphan() { return this.commentedNode == null; } @Override - public Node setComment(final Comment comment) { + public Node setComment(final Comment comment) { // comments on comments are not allowed, so we override setComment(Comment) here if (comment != null) { throw new IllegalArgumentException("A comment cannot be commented."); @@ -142,7 +140,7 @@ public Node setComment(final Comment comment) { } @Override - public boolean remove() { + public boolean remove() { if (this.commentedNode != null) { this.commentedNode.setComment(null); return true; @@ -154,7 +152,7 @@ public boolean remove() { } @Override - public Node findRootNode() { + public Node findRootNode() { // (Non-orphan) comments are not integrated into the normal AST; we need to get the commented node first. Node n = getCommentedNode().orElse(this); while (n.getParentNode().isPresent()) { @@ -165,59 +163,60 @@ public Node findRootNode() { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Comment clone() { + public Comment clone() { return (Comment) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CommentMetaModel getMetaModel() { + public CommentMetaModel getMetaModel() { return JavaParserMetaModel.commentMetaModel; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBlockComment() { + public boolean isBlockComment() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BlockComment asBlockComment() { - throw new IllegalStateException( - f("%s is not BlockComment, it is %s", this, this.getClass().getSimpleName())); + public BlockComment asBlockComment() { + throw new IllegalStateException(f("%s is not BlockComment, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJavadocComment() { + public boolean isJavadocComment() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JavadocComment asJavadocComment() { - throw new IllegalStateException( - f("%s is not JavadocComment, it is %s", this, this.getClass().getSimpleName())); + public JavadocComment asJavadocComment() { + throw new IllegalStateException(f("%s is not JavadocComment, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBlockComment(Consumer action) {} + public void ifBlockComment(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJavadocComment(Consumer action) {} + public void ifJavadocComment(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLineComment(Consumer action) {} + public void ifLineComment(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBlockComment() { + public Optional toBlockComment() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJavadocComment() { + public Optional toJavadocComment() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLineComment() { + public Optional toLineComment() { return Optional.empty(); } @@ -234,7 +233,7 @@ public Optional toLineComment() { /* * Returns the content of the comment with header and footer */ - public String asString() { + public String asString() { return getHeader() + getContent() + getFooter(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java index 0bd742f7ba..1bfe81841d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.comments; import static com.github.javaparser.ast.Node.NODE_BY_BEGIN_POSITION; - import com.github.javaparser.Range; import java.util.Collection; import java.util.Set; @@ -31,42 +30,34 @@ /** * The comments contained in a certain parsed piece of source code. */ -public class CommentsCollection { +public class CommentsCollection { private final TreeSet comments = new TreeSet<>(NODE_BY_BEGIN_POSITION); - public CommentsCollection() {} + public CommentsCollection() { + } - public CommentsCollection(Collection commentsToCopy) { + public CommentsCollection(Collection commentsToCopy) { comments.addAll(commentsToCopy); } - public Set getLineComments() { - return comments.stream() - .filter(comment -> comment instanceof LineComment) - .map(comment -> (LineComment) comment) - .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); + public Set getLineComments() { + return comments.stream().filter(comment -> comment instanceof LineComment).map(comment -> (LineComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); } - public Set getBlockComments() { - return comments.stream() - .filter(comment -> comment instanceof BlockComment) - .map(comment -> (BlockComment) comment) - .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); + public Set getBlockComments() { + return comments.stream().filter(comment -> comment instanceof BlockComment).map(comment -> (BlockComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); } - public Set getJavadocComments() { - return comments.stream() - .filter(comment -> comment instanceof JavadocComment) - .map(comment -> (JavadocComment) comment) - .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); + public Set getJavadocComments() { + return comments.stream().filter(comment -> comment instanceof JavadocComment).map(comment -> (JavadocComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION))); } - public void addComment(Comment comment) { + public void addComment(Comment comment) { comments.add(comment); } - public boolean contains(Comment comment) { + public boolean contains(Comment comment) { if (!comment.hasRange()) { return false; } @@ -78,31 +69,28 @@ public boolean contains(Comment comment) { Range cRange = c.getRange().get(); // we tolerate a difference of one element in the end column: // it depends how \r and \n are calculated... - if (cRange.begin.equals(commentRange.begin) - && cRange.end.line == commentRange.end.line - && Math.abs(cRange.end.column - commentRange.end.column) < 2) { + if (cRange.begin.equals(commentRange.begin) && cRange.end.line == commentRange.end.line && Math.abs(cRange.end.column - commentRange.end.column) < 2) { return true; } } return false; } - public TreeSet getComments() { + public TreeSet getComments() { return comments; } - public int size() { + public int size() { return comments.size(); } - public CommentsCollection minus(CommentsCollection other) { + public CommentsCollection minus(CommentsCollection other) { CommentsCollection result = new CommentsCollection(); - result.comments.addAll( - comments.stream().filter(comment -> !other.contains(comment)).collect(Collectors.toList())); + result.comments.addAll(comments.stream().filter(comment -> !other.contains(comment)).collect(Collectors.toList())); return result; } - public CommentsCollection copy() { + public CommentsCollection copy() { return new CommentsCollection(comments); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java index b1991ce8a3..f55ebfe3fd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.comments; import static com.github.javaparser.StaticJavaParser.parseJavadoc; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -33,20 +32,21 @@ import com.github.javaparser.metamodel.JavadocCommentMetaModel; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * A Javadoc comment. {@code /∗∗ a comment ∗/} * * @author Julio Vilmar Gesser */ -public class JavadocComment extends Comment { +public class JavadocComment extends Comment { - public JavadocComment() { + public JavadocComment() { this(null, "empty"); } @AllFieldsConstructor - public JavadocComment(String content) { + public JavadocComment(String content) { this(null, content); } @@ -54,70 +54,70 @@ public JavadocComment(String content) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JavadocComment(TokenRange tokenRange, String content) { + public JavadocComment(TokenRange tokenRange, String content) { super(tokenRange, content); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } - public Javadoc parse() { + public Javadoc parse() { return parseJavadoc(getContent()); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JavadocComment clone() { + public JavadocComment clone() { return (JavadocComment) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JavadocCommentMetaModel getMetaModel() { + public JavadocCommentMetaModel getMetaModel() { return JavaParserMetaModel.javadocCommentMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJavadocComment() { + public boolean isJavadocComment() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JavadocComment asJavadocComment() { + public JavadocComment asJavadocComment() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJavadocComment(Consumer action) { + public void ifJavadocComment(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJavadocComment() { + public Optional toJavadocComment() { return Optional.of(this); } @Override - public String getHeader() { + public String getHeader() { return "/**"; } @Override - public String getFooter() { + public String getFooter() { return "*/"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java index fd039dfb1e..da55befd8c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java @@ -40,14 +40,14 @@ * * @author Julio Vilmar Gesser */ -public class LineComment extends Comment { +public class LineComment extends Comment { - public LineComment() { + public LineComment() { this(null, "empty"); } @AllFieldsConstructor - public LineComment(String content) { + public LineComment(String content) { this(null, content); } @@ -55,66 +55,66 @@ public LineComment(String content) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LineComment(TokenRange tokenRange, String content) { + public LineComment(TokenRange tokenRange, String content) { super(tokenRange, content); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLineComment() { + public boolean isLineComment() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LineComment clone() { + public LineComment clone() { return (LineComment) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LineCommentMetaModel getMetaModel() { + public LineCommentMetaModel getMetaModel() { return JavaParserMetaModel.lineCommentMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LineComment asLineComment() { + public LineComment asLineComment() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLineComment(Consumer action) { + public void ifLineComment(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLineComment() { + public Optional toLineComment() { return Optional.of(this); } @Override - public String getHeader() { + public String getHeader() { return "//"; } @Override - public String getFooter() { + public String getFooter() { return ""; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java index 0585479ca5..1b09bec18a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -42,17 +41,16 @@ * * @author Julio Vilmar Gesser */ -public abstract class AnnotationExpr extends Expression - implements NodeWithName, Resolvable { +public abstract class AnnotationExpr extends Expression implements NodeWithName, Resolvable { protected Name name; - public AnnotationExpr() { + public AnnotationExpr() { this(null, new Name()); } @AllFieldsConstructor - public AnnotationExpr(Name name) { + public AnnotationExpr(Name name) { this(null, name); } @@ -60,25 +58,26 @@ public AnnotationExpr(Name name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public AnnotationExpr(TokenRange tokenRange, Name name) { + public AnnotationExpr(TokenRange tokenRange, Name name) { super(tokenRange); setName(name); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AnnotationExpr setName(final Name name) { + public AnnotationExpr setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -86,19 +85,19 @@ public AnnotationExpr setName(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public AnnotationExpr clone() { + public AnnotationExpr clone() { return (AnnotationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public AnnotationExprMetaModel getMetaModel() { + public AnnotationExprMetaModel getMetaModel() { return JavaParserMetaModel.annotationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -111,19 +110,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationExpr() { + public boolean isAnnotationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationExpr asAnnotationExpr() { + public AnnotationExpr asAnnotationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationExpr(Consumer action) { + public void ifAnnotationExpr(Consumer action) { action.accept(this); } @@ -137,13 +136,13 @@ public void ifAnnotationExpr(Consumer action) { * resolved. */ @Override - public ResolvedAnnotationDeclaration resolve() { + public ResolvedAnnotationDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedAnnotationDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationExpr() { + public Optional toAnnotationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java index 0ed6db4a9b..9a57bae8db 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -41,18 +40,18 @@ * * @author Julio Vilmar Gesser */ -public class ArrayAccessExpr extends Expression { +public class ArrayAccessExpr extends Expression { private Expression name; private Expression index; - public ArrayAccessExpr() { + public ArrayAccessExpr() { this(null, new NameExpr(), new IntegerLiteralExpr()); } @AllFieldsConstructor - public ArrayAccessExpr(Expression name, Expression index) { + public ArrayAccessExpr(Expression name, Expression index) { this(null, name, index); } @@ -60,56 +59,63 @@ public ArrayAccessExpr(Expression name, Expression index) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ArrayAccessExpr(TokenRange tokenRange, Expression name, Expression index) { + public ArrayAccessExpr(TokenRange tokenRange, Expression name, Expression index) { super(tokenRange); setName(name); setIndex(index); customInitialization(); } + public static Expression allElementsAccess(TokenRange range, Expression scope) { + SimpleName fieldName = new SimpleName(range, "*"); + return new ArrayAccessExpr(range, scope, new NameExpr(range, fieldName)); + } + @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getIndex() { + public Expression getIndex() { return index; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getName() { + public Expression getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayAccessExpr setIndex(final Expression index) { + public ArrayAccessExpr setIndex(final Expression index) { assertNotNull(index); if (index == this.index) { return this; } notifyPropertyChange(ObservableProperty.INDEX, this.index, index); - if (this.index != null) this.index.setParentNode(null); + if (this.index != null) + this.index.setParentNode(null); this.index = index; setAsParentNodeOf(index); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayAccessExpr setName(final Expression name) { + public ArrayAccessExpr setName(final Expression name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -117,19 +123,19 @@ public ArrayAccessExpr setName(final Expression name) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ArrayAccessExpr clone() { + public ArrayAccessExpr clone() { return (ArrayAccessExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ArrayAccessExprMetaModel getMetaModel() { + public ArrayAccessExprMetaModel getMetaModel() { return JavaParserMetaModel.arrayAccessExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -146,25 +152,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayAccessExpr() { + public boolean isArrayAccessExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayAccessExpr asArrayAccessExpr() { + public ArrayAccessExpr asArrayAccessExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayAccessExpr(Consumer action) { + public void ifArrayAccessExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayAccessExpr() { + public Optional toArrayAccessExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java index 49f488c4b4..0d3b1c5f41 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseType; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.observer.ObservableProperty; @@ -47,7 +46,7 @@ * * @author Julio Vilmar Gesser */ -public class ArrayCreationExpr extends Expression { +public class ArrayCreationExpr extends Expression { @NonEmptyProperty private NodeList levels; @@ -57,16 +56,16 @@ public class ArrayCreationExpr extends Expression { @OptionalProperty private ArrayInitializerExpr initializer; - public ArrayCreationExpr() { + public ArrayCreationExpr() { this(null, new ClassOrInterfaceType(), new NodeList<>(new ArrayCreationLevel()), new ArrayInitializerExpr()); } @AllFieldsConstructor - public ArrayCreationExpr(Type elementType, NodeList levels, ArrayInitializerExpr initializer) { + public ArrayCreationExpr(Type elementType, NodeList levels, ArrayInitializerExpr initializer) { this(null, elementType, levels, initializer); } - public ArrayCreationExpr(Type elementType) { + public ArrayCreationExpr(Type elementType) { this(null, elementType, new NodeList<>(new ArrayCreationLevel()), new ArrayInitializerExpr()); } @@ -74,11 +73,7 @@ public ArrayCreationExpr(Type elementType) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ArrayCreationExpr( - TokenRange tokenRange, - Type elementType, - NodeList levels, - ArrayInitializerExpr initializer) { + public ArrayCreationExpr(TokenRange tokenRange, Type elementType, NodeList levels, ArrayInitializerExpr initializer) { super(tokenRange); setElementType(elementType); setLevels(levels); @@ -88,23 +83,23 @@ public ArrayCreationExpr( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getInitializer() { + public Optional getInitializer() { return Optional.ofNullable(initializer); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getElementType() { + public Type getElementType() { return elementType; } @@ -115,43 +110,46 @@ public Type getElementType() { * @return this, the ArrayCreationExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayCreationExpr setInitializer(final ArrayInitializerExpr initializer) { + public ArrayCreationExpr setInitializer(final ArrayInitializerExpr initializer) { if (initializer == this.initializer) { return this; } notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer); - if (this.initializer != null) this.initializer.setParentNode(null); + if (this.initializer != null) + this.initializer.setParentNode(null); this.initializer = initializer; setAsParentNodeOf(initializer); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayCreationExpr setElementType(final Type elementType) { + public ArrayCreationExpr setElementType(final Type elementType) { assertNotNull(elementType); if (elementType == this.elementType) { return this; } notifyPropertyChange(ObservableProperty.ELEMENT_TYPE, this.elementType, elementType); - if (this.elementType != null) this.elementType.setParentNode(null); + if (this.elementType != null) + this.elementType.setParentNode(null); this.elementType = elementType; setAsParentNodeOf(elementType); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getLevels() { + public NodeList getLevels() { return levels; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayCreationExpr setLevels(final NodeList levels) { + public ArrayCreationExpr setLevels(final NodeList levels) { assertNotNull(levels); if (levels == this.levels) { return this; } notifyPropertyChange(ObservableProperty.LEVELS, this.levels, levels); - if (this.levels != null) this.levels.setParentNode(null); + if (this.levels != null) + this.levels.setParentNode(null); this.levels = levels; setAsParentNodeOf(levels); return this; @@ -160,7 +158,7 @@ public ArrayCreationExpr setLevels(final NodeList levels) { /** * Takes the element type and wraps it in an ArrayType for every array creation level. */ - public Type createdType() { + public Type createdType() { Type result = elementType; for (int i = 0; i < levels.size(); i++) { result = new ArrayType(result, ArrayType.Origin.TYPE, new NodeList<>()); @@ -174,18 +172,18 @@ public Type createdType() { * @param typeClass the type * @return this */ - public ArrayCreationExpr setElementType(Class typeClass) { + public ArrayCreationExpr setElementType(Class typeClass) { tryAddImportToParentCompilationUnit(typeClass); return setElementType(parseType(typeClass.getSimpleName())); } - public ArrayCreationExpr setElementType(final String type) { + public ArrayCreationExpr setElementType(final String type) { return setElementType(parseType(type)); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -205,25 +203,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ArrayCreationExpr removeInitializer() { + public ArrayCreationExpr removeInitializer() { return setInitializer((ArrayInitializerExpr) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ArrayCreationExpr clone() { + public ArrayCreationExpr clone() { return (ArrayCreationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ArrayCreationExprMetaModel getMetaModel() { + public ArrayCreationExprMetaModel getMetaModel() { return JavaParserMetaModel.arrayCreationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -248,25 +246,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayCreationExpr() { + public boolean isArrayCreationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayCreationExpr asArrayCreationExpr() { + public ArrayCreationExpr asArrayCreationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayCreationExpr(Consumer action) { + public void ifArrayCreationExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayCreationExpr() { + public Optional toArrayCreationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java index 21317893d1..e44bafe5fc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -44,16 +43,16 @@ * * @author Julio Vilmar Gesser */ -public class ArrayInitializerExpr extends Expression { +public class ArrayInitializerExpr extends Expression { private NodeList values; - public ArrayInitializerExpr() { + public ArrayInitializerExpr() { this(null, new NodeList<>()); } @AllFieldsConstructor - public ArrayInitializerExpr(NodeList values) { + public ArrayInitializerExpr(NodeList values) { this(null, values); } @@ -61,7 +60,7 @@ public ArrayInitializerExpr(NodeList values) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ArrayInitializerExpr(TokenRange tokenRange, NodeList values) { + public ArrayInitializerExpr(TokenRange tokenRange, NodeList values) { super(tokenRange); setValues(values); customInitialization(); @@ -69,29 +68,30 @@ public ArrayInitializerExpr(TokenRange tokenRange, NodeList values) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getValues() { + public NodeList getValues() { return values; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayInitializerExpr setValues(final NodeList values) { + public ArrayInitializerExpr setValues(final NodeList values) { assertNotNull(values); if (values == this.values) { return this; } notifyPropertyChange(ObservableProperty.VALUES, this.values, values); - if (this.values != null) this.values.setParentNode(null); + if (this.values != null) + this.values.setParentNode(null); this.values = values; setAsParentNodeOf(values); return this; @@ -99,7 +99,7 @@ public ArrayInitializerExpr setValues(final NodeList values) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -114,19 +114,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ArrayInitializerExpr clone() { + public ArrayInitializerExpr clone() { return (ArrayInitializerExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ArrayInitializerExprMetaModel getMetaModel() { + public ArrayInitializerExprMetaModel getMetaModel() { return JavaParserMetaModel.arrayInitializerExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -141,25 +141,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayInitializerExpr() { + public boolean isArrayInitializerExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayInitializerExpr asArrayInitializerExpr() { + public ArrayInitializerExpr asArrayInitializerExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayInitializerExpr(Consumer action) { + public void ifArrayInitializerExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayInitializerExpr() { + public Optional toArrayInitializerExpr() { return Optional.of(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 74080d7064..4d7cf5cc70 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 @@ -31,10 +31,8 @@ import com.github.javaparser.metamodel.AssignExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.printer.Stringable; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -47,9 +45,10 @@ * * @author Julio Vilmar Gesser */ -public class AssignExpr extends Expression { +public class AssignExpr extends Expression { + + public enum Operator implements Stringable { - public enum Operator implements Stringable { ASSIGN("="), PLUS("+="), MINUS("-="), @@ -69,12 +68,12 @@ public enum Operator implements Stringable { this.codeRepresentation = codeRepresentation; } - public String asString() { + public String asString() { return codeRepresentation; } - public Optional toBinaryOperator() { - switch (this) { + public Optional toBinaryOperator() { + switch(this) { case PLUS: return Optional.of(BinaryExpr.Operator.PLUS); case MINUS: @@ -109,12 +108,12 @@ public Optional toBinaryOperator() { private Operator operator; - public AssignExpr() { + public AssignExpr() { this(null, new NameExpr(), new StringLiteralExpr(), Operator.ASSIGN); } @AllFieldsConstructor - public AssignExpr(Expression target, Expression value, Operator operator) { + public AssignExpr(Expression target, Expression value, Operator operator) { this(null, target, value, operator); } @@ -122,7 +121,7 @@ public AssignExpr(Expression target, Expression value, Operator operator) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public AssignExpr(TokenRange tokenRange, Expression target, Expression value, Operator operator) { + public AssignExpr(TokenRange tokenRange, Expression target, Expression value, Operator operator) { super(tokenRange); setTarget(target); setValue(value); @@ -132,33 +131,33 @@ public AssignExpr(TokenRange tokenRange, Expression target, Expression value, Op @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Operator getOperator() { + public Operator getOperator() { return operator; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getTarget() { + public Expression getTarget() { return target; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getValue() { + public Expression getValue() { return value; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AssignExpr setOperator(final Operator operator) { + public AssignExpr setOperator(final Operator operator) { assertNotNull(operator); if (operator == this.operator) { return this; @@ -169,26 +168,28 @@ public AssignExpr setOperator(final Operator operator) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AssignExpr setTarget(final Expression target) { + public AssignExpr setTarget(final Expression target) { assertNotNull(target); if (target == this.target) { return this; } notifyPropertyChange(ObservableProperty.TARGET, this.target, target); - if (this.target != null) this.target.setParentNode(null); + if (this.target != null) + this.target.setParentNode(null); this.target = target; setAsParentNodeOf(target); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AssignExpr setValue(final Expression value) { + public AssignExpr setValue(final Expression value) { assertNotNull(value); if (value == this.value) { return this; } notifyPropertyChange(ObservableProperty.VALUE, this.value, value); - if (this.value != null) this.value.setParentNode(null); + if (this.value != null) + this.value.setParentNode(null); this.value = value; setAsParentNodeOf(value); return this; @@ -196,19 +197,19 @@ public AssignExpr setValue(final Expression value) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public AssignExpr clone() { + public AssignExpr clone() { return (AssignExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public AssignExprMetaModel getMetaModel() { + public AssignExprMetaModel getMetaModel() { return JavaParserMetaModel.assignExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -225,25 +226,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAssignExpr() { + public boolean isAssignExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AssignExpr asAssignExpr() { + public AssignExpr asAssignExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAssignExpr(Consumer action) { + public void ifAssignExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAssignExpr() { + public Optional toAssignExpr() { return Optional.of(this); } 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 0088f5da4e..6a2990e403 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 @@ -31,10 +31,8 @@ import com.github.javaparser.metamodel.BinaryExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.printer.Stringable; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -45,9 +43,9 @@ * * @author Julio Vilmar Gesser */ -public class BinaryExpr extends Expression { +public class BinaryExpr extends Expression { - public enum Operator implements Stringable { + public enum Operator implements Stringable { // JML IMPLICATION("==>"), @@ -85,12 +83,12 @@ public enum Operator implements Stringable { this.codeRepresentation = codeRepresentation; } - public String asString() { + public String asString() { return codeRepresentation; } - public Optional toAssignOperator() { - switch (this) { + public Optional toAssignOperator() { + switch(this) { case BINARY_OR: return Optional.of(AssignExpr.Operator.BINARY_OR); case BINARY_AND: @@ -125,12 +123,12 @@ public Optional toAssignOperator() { private Operator operator; - public BinaryExpr() { + public BinaryExpr() { this(null, new BooleanLiteralExpr(), new BooleanLiteralExpr(), Operator.EQUALS); } @AllFieldsConstructor - public BinaryExpr(Expression left, Expression right, Operator operator) { + public BinaryExpr(Expression left, Expression right, Operator operator) { this(null, left, right, operator); } @@ -138,7 +136,7 @@ public BinaryExpr(Expression left, Expression right, Operator operator) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BinaryExpr(TokenRange tokenRange, Expression left, Expression right, Operator operator) { + public BinaryExpr(TokenRange tokenRange, Expression left, Expression right, Operator operator) { super(tokenRange); setLeft(left); setRight(right); @@ -148,46 +146,47 @@ public BinaryExpr(TokenRange tokenRange, Expression left, Expression right, Oper @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getLeft() { + public Expression getLeft() { return left; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Operator getOperator() { + public Operator getOperator() { return operator; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getRight() { + public Expression getRight() { return right; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BinaryExpr setLeft(final Expression left) { + public BinaryExpr setLeft(final Expression left) { assertNotNull(left); if (left == this.left) { return this; } notifyPropertyChange(ObservableProperty.LEFT, this.left, left); - if (this.left != null) this.left.setParentNode(null); + if (this.left != null) + this.left.setParentNode(null); this.left = left; setAsParentNodeOf(left); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BinaryExpr setOperator(final Operator operator) { + public BinaryExpr setOperator(final Operator operator) { assertNotNull(operator); if (operator == this.operator) { return this; @@ -198,13 +197,14 @@ public BinaryExpr setOperator(final Operator operator) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BinaryExpr setRight(final Expression right) { + public BinaryExpr setRight(final Expression right) { assertNotNull(right); if (right == this.right) { return this; } notifyPropertyChange(ObservableProperty.RIGHT, this.right, right); - if (this.right != null) this.right.setParentNode(null); + if (this.right != null) + this.right.setParentNode(null); this.right = right; setAsParentNodeOf(right); return this; @@ -212,19 +212,19 @@ public BinaryExpr setRight(final Expression right) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BinaryExpr clone() { + public BinaryExpr clone() { return (BinaryExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BinaryExprMetaModel getMetaModel() { + public BinaryExprMetaModel getMetaModel() { return JavaParserMetaModel.binaryExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -241,25 +241,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBinaryExpr() { + public boolean isBinaryExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BinaryExpr asBinaryExpr() { + public BinaryExpr asBinaryExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBinaryExpr(Consumer action) { + public void ifBinaryExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBinaryExpr() { + public Optional toBinaryExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java index eb7282d056..76821644f1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java @@ -40,16 +40,16 @@ * * @author Julio Vilmar Gesser */ -public class BooleanLiteralExpr extends LiteralExpr { +public class BooleanLiteralExpr extends LiteralExpr { private boolean value; - public BooleanLiteralExpr() { + public BooleanLiteralExpr() { this(null, false); } @AllFieldsConstructor - public BooleanLiteralExpr(boolean value) { + public BooleanLiteralExpr(boolean value) { this(null, value); } @@ -57,7 +57,7 @@ public BooleanLiteralExpr(boolean value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BooleanLiteralExpr(TokenRange tokenRange, boolean value) { + public BooleanLiteralExpr(TokenRange tokenRange, boolean value) { super(tokenRange); setValue(value); customInitialization(); @@ -65,13 +65,13 @@ public BooleanLiteralExpr(TokenRange tokenRange, boolean value) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -80,16 +80,16 @@ public void accept(final VoidVisitor v, final A arg) { * but "getValue" does the same and makes more sense. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isValue() { + public boolean isValue() { return value; } - public boolean getValue() { + public boolean getValue() { return isValue(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BooleanLiteralExpr setValue(final boolean value) { + public BooleanLiteralExpr setValue(final boolean value) { if (value == this.value) { return this; } @@ -100,37 +100,37 @@ public BooleanLiteralExpr setValue(final boolean value) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BooleanLiteralExpr clone() { + public BooleanLiteralExpr clone() { return (BooleanLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BooleanLiteralExprMetaModel getMetaModel() { + public BooleanLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.booleanLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBooleanLiteralExpr() { + public boolean isBooleanLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BooleanLiteralExpr asBooleanLiteralExpr() { + public BooleanLiteralExpr asBooleanLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBooleanLiteralExpr(Consumer action) { + public void ifBooleanLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBooleanLiteralExpr() { + public Optional toBooleanLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java index df00652924..ebacadabe5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java @@ -34,10 +34,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.CastExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -45,18 +43,18 @@ * * @author Julio Vilmar Gesser */ -public class CastExpr extends Expression implements NodeWithType, NodeWithExpression { +public class CastExpr extends Expression implements NodeWithType, NodeWithExpression { private Type type; private Expression expression; - public CastExpr() { + public CastExpr() { this(null, new ClassOrInterfaceType(), new NameExpr()); } @AllFieldsConstructor - public CastExpr(Type type, Expression expression) { + public CastExpr(Type type, Expression expression) { this(null, type, expression); } @@ -64,7 +62,7 @@ public CastExpr(Type type, Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CastExpr(TokenRange tokenRange, Type type, Expression expression) { + public CastExpr(TokenRange tokenRange, Type type, Expression expression) { super(tokenRange); setType(type); setExpression(expression); @@ -73,47 +71,49 @@ public CastExpr(TokenRange tokenRange, Type type, Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CastExpr setExpression(final Expression expression) { + public CastExpr setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CastExpr setType(final Type type) { + public CastExpr setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -121,19 +121,19 @@ public CastExpr setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CastExpr clone() { + public CastExpr clone() { return (CastExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CastExprMetaModel getMetaModel() { + public CastExprMetaModel getMetaModel() { return JavaParserMetaModel.castExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -150,25 +150,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCastExpr() { + public boolean isCastExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CastExpr asCastExpr() { + public CastExpr asCastExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCastExpr(Consumer action) { + public void ifCastExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCastExpr() { + public Optional toCastExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java index 72044a2ca4..63c5da12db 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java @@ -44,14 +44,14 @@ * * @author Julio Vilmar Gesser */ -public class CharLiteralExpr extends LiteralStringValueExpr { +public class CharLiteralExpr extends LiteralStringValueExpr { - public CharLiteralExpr() { + public CharLiteralExpr() { this(null, "?"); } @AllFieldsConstructor - public CharLiteralExpr(String value) { + public CharLiteralExpr(String value) { this(null, value); } @@ -60,7 +60,7 @@ public CharLiteralExpr(String value) { * * @param value a char */ - public CharLiteralExpr(char value) { + public CharLiteralExpr(char value) { this(null, StringEscapeUtils.escapeJava(String.valueOf(value))); } @@ -68,7 +68,7 @@ public CharLiteralExpr(char value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CharLiteralExpr(TokenRange tokenRange, String value) { + public CharLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } @@ -82,20 +82,20 @@ public static CharLiteralExpr escape(String string) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } /** * @return the unescaped value character of this literal */ - public char asChar() { + public char asChar() { return StringEscapeUtils.unescapeJava(value).charAt(0); } @@ -105,44 +105,44 @@ public char asChar() { * @param value a char * @return this expression */ - public CharLiteralExpr setChar(char value) { + public CharLiteralExpr setChar(char value) { this.value = String.valueOf(value); return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CharLiteralExpr clone() { + public CharLiteralExpr clone() { return (CharLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CharLiteralExprMetaModel getMetaModel() { + public CharLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.charLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCharLiteralExpr() { + public boolean isCharLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CharLiteralExpr asCharLiteralExpr() { + public CharLiteralExpr asCharLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCharLiteralExpr(Consumer action) { + public void ifCharLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCharLiteralExpr() { + public Optional toCharLiteralExpr() { return Optional.of(this); } } 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 c22f4042c4..c1d10729f5 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 @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ClassExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -45,16 +43,16 @@ * * @author Julio Vilmar Gesser */ -public class ClassExpr extends Expression implements NodeWithType { +public class ClassExpr extends Expression implements NodeWithType { private Type type; - public ClassExpr() { + public ClassExpr() { this(null, new ClassOrInterfaceType()); } @AllFieldsConstructor - public ClassExpr(Type type) { + public ClassExpr(Type type) { this(null, type); } @@ -62,7 +60,7 @@ public ClassExpr(Type type) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ClassExpr(TokenRange tokenRange, Type type) { + public ClassExpr(TokenRange tokenRange, Type type) { super(tokenRange); setType(type); customInitialization(); @@ -70,29 +68,30 @@ public ClassExpr(TokenRange tokenRange, Type type) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassExpr setType(final Type type) { + public ClassExpr setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -100,19 +99,19 @@ public ClassExpr setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ClassExpr clone() { + public ClassExpr clone() { return (ClassExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ClassExprMetaModel getMetaModel() { + public ClassExprMetaModel getMetaModel() { return JavaParserMetaModel.classExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -125,25 +124,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassExpr() { + public boolean isClassExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassExpr asClassExpr() { + public ClassExpr asClassExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassExpr(Consumer action) { + public void ifClassExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassExpr() { + public Optional toClassExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java index 412c085eb1..0b8bf9292b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java @@ -31,10 +31,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ConditionalExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -43,7 +41,7 @@ * * @author Julio Vilmar Gesser */ -public class ConditionalExpr extends Expression implements NodeWithCondition { +public class ConditionalExpr extends Expression implements NodeWithCondition { private Expression condition; @@ -51,12 +49,12 @@ public class ConditionalExpr extends Expression implements NodeWithCondition R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCondition() { + public Expression getCondition() { return condition; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getElseExpr() { + public Expression getElseExpr() { return elseExpr; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getThenExpr() { + public Expression getThenExpr() { return thenExpr; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ConditionalExpr setCondition(final Expression condition) { + public ConditionalExpr setCondition(final Expression condition) { assertNotNull(condition); if (condition == this.condition) { return this; } notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition); - if (this.condition != null) this.condition.setParentNode(null); + if (this.condition != null) + this.condition.setParentNode(null); this.condition = condition; setAsParentNodeOf(condition); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ConditionalExpr setElseExpr(final Expression elseExpr) { + public ConditionalExpr setElseExpr(final Expression elseExpr) { assertNotNull(elseExpr); if (elseExpr == this.elseExpr) { return this; } notifyPropertyChange(ObservableProperty.ELSE_EXPR, this.elseExpr, elseExpr); - if (this.elseExpr != null) this.elseExpr.setParentNode(null); + if (this.elseExpr != null) + this.elseExpr.setParentNode(null); this.elseExpr = elseExpr; setAsParentNodeOf(elseExpr); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ConditionalExpr setThenExpr(final Expression thenExpr) { + public ConditionalExpr setThenExpr(final Expression thenExpr) { assertNotNull(thenExpr); if (thenExpr == this.thenExpr) { return this; } notifyPropertyChange(ObservableProperty.THEN_EXPR, this.thenExpr, thenExpr); - if (this.thenExpr != null) this.thenExpr.setParentNode(null); + if (this.thenExpr != null) + this.thenExpr.setParentNode(null); this.thenExpr = thenExpr; setAsParentNodeOf(thenExpr); return this; @@ -140,19 +141,19 @@ public ConditionalExpr setThenExpr(final Expression thenExpr) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ConditionalExpr clone() { + public ConditionalExpr clone() { return (ConditionalExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ConditionalExprMetaModel getMetaModel() { + public ConditionalExprMetaModel getMetaModel() { return JavaParserMetaModel.conditionalExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -173,25 +174,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isConditionalExpr() { + public boolean isConditionalExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ConditionalExpr asConditionalExpr() { + public ConditionalExpr asConditionalExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifConditionalExpr(Consumer action) { + public void ifConditionalExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toConditionalExpr() { + public Optional toConditionalExpr() { return Optional.of(this); } @@ -200,7 +201,7 @@ public Optional toConditionalExpr() { * Otherwise, it is a standalone expression. */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { return appearsInAssignmentContext() || appearsInInvocationContext(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java index 69f9312afb..c9b49f6439 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java @@ -40,14 +40,14 @@ * * @author Julio Vilmar Gesser */ -public class DoubleLiteralExpr extends LiteralStringValueExpr { +public class DoubleLiteralExpr extends LiteralStringValueExpr { - public DoubleLiteralExpr() { + public DoubleLiteralExpr() { this(null, "0"); } @AllFieldsConstructor - public DoubleLiteralExpr(final String value) { + public DoubleLiteralExpr(final String value) { this(null, value); } @@ -55,31 +55,31 @@ public DoubleLiteralExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public DoubleLiteralExpr(TokenRange tokenRange, String value) { + public DoubleLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } - public DoubleLiteralExpr(final double value) { + public DoubleLiteralExpr(final double value) { this(null, String.valueOf(value)); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } /** * @return the literal value as a double */ - public double asDouble() { + public double asDouble() { // Underscores are allowed in number literals for readability reasons but cause a NumberFormatException if // passed along to Double#parseDouble. Hence, we apply a simple filter to remove all underscores. // See https://github.com/javaparser/javaparser/issues/1980 for more information. @@ -87,44 +87,44 @@ public double asDouble() { return Double.parseDouble(noUnderscoreValue); } - public DoubleLiteralExpr setDouble(double value) { + public DoubleLiteralExpr setDouble(double value) { this.value = String.valueOf(value); return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public DoubleLiteralExpr clone() { + public DoubleLiteralExpr clone() { return (DoubleLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public DoubleLiteralExprMetaModel getMetaModel() { + public DoubleLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.doubleLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isDoubleLiteralExpr() { + public boolean isDoubleLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public DoubleLiteralExpr asDoubleLiteralExpr() { + public DoubleLiteralExpr asDoubleLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifDoubleLiteralExpr(Consumer action) { + public void ifDoubleLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toDoubleLiteralExpr() { + public Optional toDoubleLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java index 0ea2e6b287..d15c1ac2ae 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java @@ -30,10 +30,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.EnclosedExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -42,16 +40,16 @@ * * @author Julio Vilmar Gesser */ -public class EnclosedExpr extends Expression { +public class EnclosedExpr extends Expression { private Expression inner; - public EnclosedExpr() { + public EnclosedExpr() { this(null, new StringLiteralExpr()); } @AllFieldsConstructor - public EnclosedExpr(final Expression inner) { + public EnclosedExpr(final Expression inner) { this(null, inner); } @@ -59,7 +57,7 @@ public EnclosedExpr(final Expression inner) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public EnclosedExpr(TokenRange tokenRange, Expression inner) { + public EnclosedExpr(TokenRange tokenRange, Expression inner) { super(tokenRange); setInner(inner); customInitialization(); @@ -67,18 +65,18 @@ public EnclosedExpr(TokenRange tokenRange, Expression inner) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getInner() { + public Expression getInner() { return inner; } @@ -89,13 +87,14 @@ public Expression getInner() { * @return this, the EnclosedExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public EnclosedExpr setInner(final Expression inner) { + public EnclosedExpr setInner(final Expression inner) { assertNotNull(inner); if (inner == this.inner) { return this; } notifyPropertyChange(ObservableProperty.INNER, this.inner, inner); - if (this.inner != null) this.inner.setParentNode(null); + if (this.inner != null) + this.inner.setParentNode(null); this.inner = inner; setAsParentNodeOf(inner); return this; @@ -103,19 +102,19 @@ public EnclosedExpr setInner(final Expression inner) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public EnclosedExpr clone() { + public EnclosedExpr clone() { return (EnclosedExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public EnclosedExprMetaModel getMetaModel() { + public EnclosedExprMetaModel getMetaModel() { return JavaParserMetaModel.enclosedExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -128,25 +127,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnclosedExpr() { + public boolean isEnclosedExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnclosedExpr asEnclosedExpr() { + public EnclosedExpr asEnclosedExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnclosedExpr(Consumer action) { + public void ifEnclosedExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnclosedExpr() { + public Optional toEnclosedExpr() { return Optional.of(this); } @@ -155,7 +154,7 @@ public Optional toEnclosedExpr() { * (https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.8.5) */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { return getInner().isPolyExpression(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java index 7ea59d2262..763325e56d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java @@ -24,18 +24,17 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.jml.expr.*; import com.github.javaparser.ast.nodeTypes.NodeWithOptionalScope; import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments; import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.metamodel.ExpressionMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.resolution.types.ResolvedType; - import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; - import static com.github.javaparser.utils.CodeGenerationUtils.f; /** @@ -65,7 +64,7 @@ public abstract class Expression extends Node { }; @AllFieldsConstructor - public Expression() { + public Expression() { this(null); } @@ -73,727 +72,720 @@ public Expression() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Expression(TokenRange tokenRange) { + public Expression(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Expression clone() { + public Expression clone() { return (Expression) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ExpressionMetaModel getMetaModel() { + public ExpressionMetaModel getMetaModel() { return JavaParserMetaModel.expressionMetaModel; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAnnotationExpr() { + public boolean isAnnotationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AnnotationExpr asAnnotationExpr() { - throw new IllegalStateException( - f("%s is not AnnotationExpr, it is %s", this, this.getClass().getSimpleName())); + public AnnotationExpr asAnnotationExpr() { + throw new IllegalStateException(f("%s is not AnnotationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayAccessExpr() { + public boolean isArrayAccessExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayAccessExpr asArrayAccessExpr() { - throw new IllegalStateException( - f("%s is not ArrayAccessExpr, it is %s", this, this.getClass().getSimpleName())); + public ArrayAccessExpr asArrayAccessExpr() { + throw new IllegalStateException(f("%s is not ArrayAccessExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayCreationExpr() { + public boolean isArrayCreationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayCreationExpr asArrayCreationExpr() { - throw new IllegalStateException( - f("%s is not ArrayCreationExpr, it is %s", this, this.getClass().getSimpleName())); + public ArrayCreationExpr asArrayCreationExpr() { + throw new IllegalStateException(f("%s is not ArrayCreationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayInitializerExpr() { + public boolean isArrayInitializerExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayInitializerExpr asArrayInitializerExpr() { - throw new IllegalStateException(f( - "%s is not ArrayInitializerExpr, it is %s", - this, this.getClass().getSimpleName())); + public ArrayInitializerExpr asArrayInitializerExpr() { + throw new IllegalStateException(f("%s is not ArrayInitializerExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAssignExpr() { + public boolean isAssignExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AssignExpr asAssignExpr() { - throw new IllegalStateException( - f("%s is not AssignExpr, it is %s", this, this.getClass().getSimpleName())); + public AssignExpr asAssignExpr() { + throw new IllegalStateException(f("%s is not AssignExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBinaryExpr() { + public boolean isBinaryExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BinaryExpr asBinaryExpr() { - throw new IllegalStateException( - f("%s is not BinaryExpr, it is %s", this, this.getClass().getSimpleName())); + public BinaryExpr asBinaryExpr() { + throw new IllegalStateException(f("%s is not BinaryExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBooleanLiteralExpr() { + public boolean isBooleanLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BooleanLiteralExpr asBooleanLiteralExpr() { - throw new IllegalStateException(f( - "%s is not BooleanLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public BooleanLiteralExpr asBooleanLiteralExpr() { + throw new IllegalStateException(f("%s is not BooleanLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCastExpr() { + public boolean isCastExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CastExpr asCastExpr() { - throw new IllegalStateException( - f("%s is not CastExpr, it is %s", this, this.getClass().getSimpleName())); + public CastExpr asCastExpr() { + throw new IllegalStateException(f("%s is not CastExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isCharLiteralExpr() { + public boolean isCharLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public CharLiteralExpr asCharLiteralExpr() { - throw new IllegalStateException( - f("%s is not CharLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public CharLiteralExpr asCharLiteralExpr() { + throw new IllegalStateException(f("%s is not CharLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassExpr() { + public boolean isClassExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassExpr asClassExpr() { - throw new IllegalStateException( - f("%s is not ClassExpr, it is %s", this, this.getClass().getSimpleName())); + public ClassExpr asClassExpr() { + throw new IllegalStateException(f("%s is not ClassExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isConditionalExpr() { + public boolean isConditionalExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ConditionalExpr asConditionalExpr() { - throw new IllegalStateException( - f("%s is not ConditionalExpr, it is %s", this, this.getClass().getSimpleName())); + public ConditionalExpr asConditionalExpr() { + throw new IllegalStateException(f("%s is not ConditionalExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isDoubleLiteralExpr() { + public boolean isDoubleLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public DoubleLiteralExpr asDoubleLiteralExpr() { - throw new IllegalStateException( - f("%s is not DoubleLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public DoubleLiteralExpr asDoubleLiteralExpr() { + throw new IllegalStateException(f("%s is not DoubleLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEnclosedExpr() { + public boolean isEnclosedExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EnclosedExpr asEnclosedExpr() { - throw new IllegalStateException( - f("%s is not EnclosedExpr, it is %s", this, this.getClass().getSimpleName())); + public EnclosedExpr asEnclosedExpr() { + throw new IllegalStateException(f("%s is not EnclosedExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isFieldAccessExpr() { + public boolean isFieldAccessExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public FieldAccessExpr asFieldAccessExpr() { - throw new IllegalStateException( - f("%s is not FieldAccessExpr, it is %s", this, this.getClass().getSimpleName())); + public FieldAccessExpr asFieldAccessExpr() { + throw new IllegalStateException(f("%s is not FieldAccessExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isInstanceOfExpr() { + public boolean isInstanceOfExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public InstanceOfExpr asInstanceOfExpr() { - throw new IllegalStateException( - f("%s is not InstanceOfExpr, it is %s", this, this.getClass().getSimpleName())); + public InstanceOfExpr asInstanceOfExpr() { + throw new IllegalStateException(f("%s is not InstanceOfExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIntegerLiteralExpr() { + public boolean isIntegerLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IntegerLiteralExpr asIntegerLiteralExpr() { - throw new IllegalStateException(f( - "%s is not IntegerLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public IntegerLiteralExpr asIntegerLiteralExpr() { + throw new IllegalStateException(f("%s is not IntegerLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLambdaExpr() { + public boolean isLambdaExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LambdaExpr asLambdaExpr() { - throw new IllegalStateException( - f("%s is not LambdaExpr, it is %s", this, this.getClass().getSimpleName())); + public LambdaExpr asLambdaExpr() { + throw new IllegalStateException(f("%s is not LambdaExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLiteralExpr() { + public boolean isLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LiteralExpr asLiteralExpr() { - throw new IllegalStateException( - f("%s is not LiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public LiteralExpr asLiteralExpr() { + throw new IllegalStateException(f("%s is not LiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLiteralStringValueExpr() { + public boolean isLiteralStringValueExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LiteralStringValueExpr asLiteralStringValueExpr() { - throw new IllegalStateException(f( - "%s is not LiteralStringValueExpr, it is %s", - this, this.getClass().getSimpleName())); + public LiteralStringValueExpr asLiteralStringValueExpr() { + throw new IllegalStateException(f("%s is not LiteralStringValueExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLongLiteralExpr() { + public boolean isLongLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LongLiteralExpr asLongLiteralExpr() { - throw new IllegalStateException( - f("%s is not LongLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public LongLiteralExpr asLongLiteralExpr() { + throw new IllegalStateException(f("%s is not LongLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMarkerAnnotationExpr() { + public boolean isMarkerAnnotationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MarkerAnnotationExpr asMarkerAnnotationExpr() { - throw new IllegalStateException(f( - "%s is not MarkerAnnotationExpr, it is %s", - this, this.getClass().getSimpleName())); + public MarkerAnnotationExpr asMarkerAnnotationExpr() { + throw new IllegalStateException(f("%s is not MarkerAnnotationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodCallExpr() { + public boolean isMethodCallExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodCallExpr asMethodCallExpr() { - throw new IllegalStateException( - f("%s is not MethodCallExpr, it is %s", this, this.getClass().getSimpleName())); + public MethodCallExpr asMethodCallExpr() { + throw new IllegalStateException(f("%s is not MethodCallExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodReferenceExpr() { + public boolean isMethodReferenceExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodReferenceExpr asMethodReferenceExpr() { - throw new IllegalStateException(f( - "%s is not MethodReferenceExpr, it is %s", this, this.getClass().getSimpleName())); + public MethodReferenceExpr asMethodReferenceExpr() { + throw new IllegalStateException(f("%s is not MethodReferenceExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNameExpr() { + public boolean isNameExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NameExpr asNameExpr() { - throw new IllegalStateException( - f("%s is not NameExpr, it is %s", this, this.getClass().getSimpleName())); + public NameExpr asNameExpr() { + throw new IllegalStateException(f("%s is not NameExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNormalAnnotationExpr() { + public boolean isNormalAnnotationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NormalAnnotationExpr asNormalAnnotationExpr() { - throw new IllegalStateException(f( - "%s is not NormalAnnotationExpr, it is %s", - this, this.getClass().getSimpleName())); + public NormalAnnotationExpr asNormalAnnotationExpr() { + throw new IllegalStateException(f("%s is not NormalAnnotationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNullLiteralExpr() { + public boolean isNullLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NullLiteralExpr asNullLiteralExpr() { - throw new IllegalStateException( - f("%s is not NullLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public NullLiteralExpr asNullLiteralExpr() { + throw new IllegalStateException(f("%s is not NullLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isObjectCreationExpr() { + public boolean isObjectCreationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ObjectCreationExpr asObjectCreationExpr() { - throw new IllegalStateException(f( - "%s is not ObjectCreationExpr, it is %s", this, this.getClass().getSimpleName())); + public ObjectCreationExpr asObjectCreationExpr() { + throw new IllegalStateException(f("%s is not ObjectCreationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSingleMemberAnnotationExpr() { + public boolean isSingleMemberAnnotationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SingleMemberAnnotationExpr asSingleMemberAnnotationExpr() { - throw new IllegalStateException(f( - "%s is not SingleMemberAnnotationExpr, it is %s", - this, this.getClass().getSimpleName())); + public SingleMemberAnnotationExpr asSingleMemberAnnotationExpr() { + throw new IllegalStateException(f("%s is not SingleMemberAnnotationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isStringLiteralExpr() { + public boolean isStringLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public StringLiteralExpr asStringLiteralExpr() { - throw new IllegalStateException( - f("%s is not StringLiteralExpr, it is %s", this, this.getClass().getSimpleName())); + public StringLiteralExpr asStringLiteralExpr() { + throw new IllegalStateException(f("%s is not StringLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSuperExpr() { + public boolean isSuperExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SuperExpr asSuperExpr() { - throw new IllegalStateException( - f("%s is not SuperExpr, it is %s", this, this.getClass().getSimpleName())); + public SuperExpr asSuperExpr() { + throw new IllegalStateException(f("%s is not SuperExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isThisExpr() { + public boolean isThisExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ThisExpr asThisExpr() { - throw new IllegalStateException( - f("%s is not ThisExpr, it is %s", this, this.getClass().getSimpleName())); + public ThisExpr asThisExpr() { + throw new IllegalStateException(f("%s is not ThisExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeExpr() { + public boolean isTypeExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeExpr asTypeExpr() { - throw new IllegalStateException( - f("%s is not TypeExpr, it is %s", this, this.getClass().getSimpleName())); + public TypeExpr asTypeExpr() { + throw new IllegalStateException(f("%s is not TypeExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnaryExpr() { + public boolean isUnaryExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnaryExpr asUnaryExpr() { - throw new IllegalStateException( - f("%s is not UnaryExpr, it is %s", this, this.getClass().getSimpleName())); + public UnaryExpr asUnaryExpr() { + throw new IllegalStateException(f("%s is not UnaryExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVariableDeclarationExpr() { + public boolean isVariableDeclarationExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VariableDeclarationExpr asVariableDeclarationExpr() { - throw new IllegalStateException(f( - "%s is not VariableDeclarationExpr, it is %s", - this, this.getClass().getSimpleName())); + public VariableDeclarationExpr asVariableDeclarationExpr() { + throw new IllegalStateException(f("%s is not VariableDeclarationExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAnnotationExpr(Consumer action) {} + public void ifAnnotationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayAccessExpr(Consumer action) {} + public void ifArrayAccessExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayCreationExpr(Consumer action) {} + public void ifArrayCreationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayInitializerExpr(Consumer action) {} + public void ifArrayInitializerExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAssignExpr(Consumer action) {} + public void ifAssignExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBinaryExpr(Consumer action) {} + public void ifBinaryExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBooleanLiteralExpr(Consumer action) {} + public void ifBooleanLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCastExpr(Consumer action) {} + public void ifCastExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifCharLiteralExpr(Consumer action) {} + public void ifCharLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassExpr(Consumer action) {} + public void ifClassExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifConditionalExpr(Consumer action) {} + public void ifConditionalExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifDoubleLiteralExpr(Consumer action) {} + public void ifDoubleLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEnclosedExpr(Consumer action) {} + public void ifEnclosedExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifFieldAccessExpr(Consumer action) {} + public void ifFieldAccessExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifInstanceOfExpr(Consumer action) {} + public void ifInstanceOfExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIntegerLiteralExpr(Consumer action) {} + public void ifIntegerLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLambdaExpr(Consumer action) {} + public void ifLambdaExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLiteralExpr(Consumer action) {} + public void ifLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLiteralStringValueExpr(Consumer action) {} + public void ifLiteralStringValueExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLongLiteralExpr(Consumer action) {} + public void ifLongLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMarkerAnnotationExpr(Consumer action) {} + public void ifMarkerAnnotationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodCallExpr(Consumer action) {} + public void ifMethodCallExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodReferenceExpr(Consumer action) {} + public void ifMethodReferenceExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNameExpr(Consumer action) {} + public void ifNameExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNormalAnnotationExpr(Consumer action) {} + public void ifNormalAnnotationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNullLiteralExpr(Consumer action) {} + public void ifNullLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifObjectCreationExpr(Consumer action) {} + public void ifObjectCreationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSingleMemberAnnotationExpr(Consumer action) {} + public void ifSingleMemberAnnotationExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifStringLiteralExpr(Consumer action) {} + public void ifStringLiteralExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSuperExpr(Consumer action) {} + public void ifSuperExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifThisExpr(Consumer action) {} + public void ifThisExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeExpr(Consumer action) {} + public void ifTypeExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnaryExpr(Consumer action) {} + public void ifUnaryExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVariableDeclarationExpr(Consumer action) {} + public void ifVariableDeclarationExpr(Consumer action) { + } /** * returns the type associated with the node. */ - public ResolvedType calculateResolvedType() { + public ResolvedType calculateResolvedType() { return getSymbolResolver().calculateType(this); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAnnotationExpr() { + public Optional toAnnotationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayAccessExpr() { + public Optional toArrayAccessExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayCreationExpr() { + public Optional toArrayCreationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayInitializerExpr() { + public Optional toArrayInitializerExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAssignExpr() { + public Optional toAssignExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBinaryExpr() { + public Optional toBinaryExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBooleanLiteralExpr() { + public Optional toBooleanLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCastExpr() { + public Optional toCastExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toCharLiteralExpr() { + public Optional toCharLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassExpr() { + public Optional toClassExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toConditionalExpr() { + public Optional toConditionalExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toDoubleLiteralExpr() { + public Optional toDoubleLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEnclosedExpr() { + public Optional toEnclosedExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toFieldAccessExpr() { + public Optional toFieldAccessExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toInstanceOfExpr() { + public Optional toInstanceOfExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIntegerLiteralExpr() { + public Optional toIntegerLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLambdaExpr() { + public Optional toLambdaExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLiteralExpr() { + public Optional toLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLiteralStringValueExpr() { + public Optional toLiteralStringValueExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLongLiteralExpr() { + public Optional toLongLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMarkerAnnotationExpr() { + public Optional toMarkerAnnotationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodCallExpr() { + public Optional toMethodCallExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodReferenceExpr() { + public Optional toMethodReferenceExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNameExpr() { + public Optional toNameExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNormalAnnotationExpr() { + public Optional toNormalAnnotationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNullLiteralExpr() { + public Optional toNullLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toObjectCreationExpr() { + public Optional toObjectCreationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSingleMemberAnnotationExpr() { + public Optional toSingleMemberAnnotationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toStringLiteralExpr() { + public Optional toStringLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSuperExpr() { + public Optional toSuperExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toThisExpr() { + public Optional toThisExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeExpr() { + public Optional toTypeExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnaryExpr() { + public Optional toUnaryExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVariableDeclarationExpr() { + public Optional toVariableDeclarationExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSwitchExpr() { + public boolean isSwitchExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SwitchExpr asSwitchExpr() { - throw new IllegalStateException( - f("%s is not SwitchExpr, it is %s", this, this.getClass().getSimpleName())); + public SwitchExpr asSwitchExpr() { + throw new IllegalStateException(f("%s is not SwitchExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSwitchExpr() { + public Optional toSwitchExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSwitchExpr(Consumer action) {} + public void ifSwitchExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTextBlockLiteralExpr() { + public boolean isTextBlockLiteralExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TextBlockLiteralExpr asTextBlockLiteralExpr() { - throw new IllegalStateException(f( - "%s is not TextBlockLiteralExpr, it is %s", - this, this.getClass().getSimpleName())); + public TextBlockLiteralExpr asTextBlockLiteralExpr() { + throw new IllegalStateException(f("%s is not TextBlockLiteralExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTextBlockLiteralExpr() { + public Optional toTextBlockLiteralExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTextBlockLiteralExpr(Consumer action) {} + public void ifTextBlockLiteralExpr(Consumer action) { + } /** * See https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.2 * * @return true if the expression is a standalone expression */ - public boolean isStandaloneExpression() { + public boolean isStandaloneExpression() { return !isPolyExpression(); } @@ -802,7 +794,7 @@ public boolean isStandaloneExpression() { * * @return true if the expression is a poly expression */ - public boolean isPolyExpression() { + public boolean isPolyExpression() { return false; } @@ -810,7 +802,7 @@ public boolean isPolyExpression() { * 6.5.6.2. Qualified Expression Names * https://docs.oracle.com/javase/specs/jls/se7/html/jls-6.html#jls-6.5.6.2 */ - public boolean isQualified() { + public boolean isQualified() { return hasScope(); } @@ -865,307 +857,310 @@ public final boolean elidesTypeArguments() { if (!(hasScope() && this instanceof NodeWithTypeArguments)) { return true; } - Expression scope = - (Expression) ((NodeWithOptionalScope) this).getScope().get(); + Expression scope = (Expression) ((NodeWithOptionalScope) this).getScope().get(); NodeWithTypeArguments nwta = (NodeWithTypeArguments) this; return scope.elidesTypeArguments() && (!nwta.getTypeArguments().isPresent() || nwta.isUsingDiamondOperator()); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypePatternExpr() { + public boolean isTypePatternExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypePatternExpr asTypePatternExpr() { - throw new IllegalStateException( - f("%s is not TypePatternExpr, it is %s", this, this.getClass().getSimpleName())); + public TypePatternExpr asTypePatternExpr() { + throw new IllegalStateException(f("%s is not TypePatternExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypePatternExpr() { + public Optional toTypePatternExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypePatternExpr(Consumer action) {} + public void ifTypePatternExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isPatternExpr() { + public boolean isPatternExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public PatternExpr asPatternExpr() { - throw new IllegalStateException( - f("%s is not PatternExpr, it is %s", this, this.getClass().getSimpleName())); + public PatternExpr asPatternExpr() { + throw new IllegalStateException(f("%s is not PatternExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toPatternExpr() { + public Optional toPatternExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifPatternExpr(Consumer action) {} + public void ifPatternExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isRecordPatternExpr() { + public boolean isRecordPatternExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public RecordPatternExpr asRecordPatternExpr() { - throw new IllegalStateException( - f("%s is not RecordPatternExpr, it is %s", this, this.getClass().getSimpleName())); + public RecordPatternExpr asRecordPatternExpr() { + throw new IllegalStateException(f("%s is not RecordPatternExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toRecordPatternExpr() { + public Optional toRecordPatternExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifRecordPatternExpr(Consumer action) {} + public void ifRecordPatternExpr(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBindingExpr() { + public boolean isJmlBindingExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlQuantifiedExpr asJmlBindingExpr() { + public JmlQuantifiedExpr asJmlBindingExpr() { throw new IllegalStateException(f("%s is not JmlBindingExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBindingExpr() { + public Optional toJmlBindingExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBindingExpr(Consumer action) { + public void ifJmlBindingExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlFunction() { + public boolean isJmlFunction() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabel() { + public boolean isJmlLabel() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelExpr asJmlLabel() { + public JmlLabelExpr asJmlLabel() { throw new IllegalStateException(f("%s is not JmlLabel, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabel() { + public Optional toJmlLabel() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabel(Consumer action) { + public void ifJmlLabel(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLetExpr() { + public boolean isJmlLetExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLetExpr asJmlLetExpr() { + public JmlLetExpr asJmlLetExpr() { throw new IllegalStateException(f("%s is not JmlLetExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLetExpr() { + public Optional toJmlLetExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLetExpr(Consumer action) { + public void ifJmlLetExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMultiCompareExpr() { + public boolean isJmlMultiCompareExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMultiCompareExpr asJmlMultiCompareExpr() { + public JmlMultiCompareExpr asJmlMultiCompareExpr() { throw new IllegalStateException(f("%s is not JmlMultiCompareExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMultiCompareExpr() { + public Optional toJmlMultiCompareExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMultiCompareExpr(Consumer action) { + public void ifJmlMultiCompareExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlQuantifiedExpr() { + public boolean isJmlQuantifiedExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlQuantifiedExpr asJmlQuantifiedExpr() { + public JmlQuantifiedExpr asJmlQuantifiedExpr() { throw new IllegalStateException(f("%s is not JmlQuantifiedExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlQuantifiedExpr() { + public Optional toJmlQuantifiedExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlQuantifiedExpr(Consumer action) { + public void ifJmlQuantifiedExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSetComprehension() { + public boolean isJmlSetComprehension() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSetComprehensionExpr asJmlSetComprehension() { + public JmlSetComprehensionExpr asJmlSetComprehension() { throw new IllegalStateException(f("%s is not JmlSetComprehensionExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSetComprehension() { + public Optional toJmlSetComprehension() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSetComprehension(Consumer action) { + public void ifJmlSetComprehension(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetArrayAccess() { + public boolean isLocationSetArrayAccess() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetBindingExpr() { + public boolean isLocationSetBindingExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetExpression() { + public boolean isLocationSetExpression() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetFieldAccess() { + public boolean isLocationSetFieldAccess() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetFunction() { + public boolean isLocationSetFunction() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetLiftExpression() { + public boolean isLocationSetLiftExpression() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetPrimary() { + public boolean isLocationSetPrimary() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetWrapperExpression() { + public boolean isLocationSetWrapperExpression() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetConstructorExpression() { + public boolean isLocationSetConstructorExpression() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocationSetStoreRef() { + public boolean isLocationSetStoreRef() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBinaryInfixExpr() { + public boolean isJmlBinaryInfixExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlBinaryInfixExpr asJmlBinaryInfixExpr() { + public JmlBinaryInfixExpr asJmlBinaryInfixExpr() { throw new IllegalStateException(f("%s is not JmlBinaryInfixExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBinaryInfixExpr() { + public Optional toJmlBinaryInfixExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBinaryInfixExpr(Consumer action) { + public void ifJmlBinaryInfixExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabelExpr() { + public boolean isJmlLabelExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelExpr asJmlLabelExpr() { + public JmlLabelExpr asJmlLabelExpr() { throw new IllegalStateException(f("%s is not JmlLabelExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabelExpr() { + public Optional toJmlLabelExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabelExpr(Consumer action) { + public void ifJmlLabelExpr(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlTypeExpr() { + public boolean isJmlTypeExpr() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlTypeExpr asJmlTypeExpr() { + public JmlTypeExpr asJmlTypeExpr() { throw new IllegalStateException(f("%s is not JmlTypeExpr, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlTypeExpr() { + public Optional toJmlTypeExpr() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlTypeExpr(Consumer action) { + public void ifJmlTypeExpr(Consumer action) { } - public boolean isJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public boolean isJmlSetComprehensionExpr() { return false; } - public JmlSetComprehensionExpr asJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public JmlSetComprehensionExpr asJmlSetComprehensionExpr() { throw new IllegalStateException(f("%s is not JmlSetComprehensionExpr, it is %s", this, this.getClass().getSimpleName())); } - public Optional toJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public Optional toJmlSetComprehensionExpr() { return Optional.empty(); } - public void ifJmlSetComprehensionExpr(Consumer action) { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public void ifJmlSetComprehensionExpr(Consumer action) { } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java index e7a84ef60f..f28ae8af29 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -51,11 +50,7 @@ * * @author Julio Vilmar Gesser */ -public class FieldAccessExpr extends Expression - implements NodeWithSimpleName, - NodeWithTypeArguments, - NodeWithScope, - Resolvable { +public class FieldAccessExpr extends Expression implements NodeWithSimpleName, NodeWithTypeArguments, NodeWithScope, Resolvable { private Expression scope; @@ -64,16 +59,16 @@ public class FieldAccessExpr extends Expression private SimpleName name; - public FieldAccessExpr() { + public FieldAccessExpr() { this(null, new ThisExpr(), null, new SimpleName()); } - public FieldAccessExpr(final Expression scope, final String name) { + public FieldAccessExpr(final Expression scope, final String name) { this(null, scope, null, new SimpleName(name)); } @AllFieldsConstructor - public FieldAccessExpr(final Expression scope, final NodeList typeArguments, final SimpleName name) { + public FieldAccessExpr(final Expression scope, final NodeList typeArguments, final SimpleName name) { this(null, scope, typeArguments, name); } @@ -81,7 +76,7 @@ public FieldAccessExpr(final Expression scope, final NodeList typeArgument * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public FieldAccessExpr(TokenRange tokenRange, Expression scope, NodeList typeArguments, SimpleName name) { + public FieldAccessExpr(TokenRange tokenRange, Expression scope, NodeList typeArguments, SimpleName name) { super(tokenRange); setScope(scope); setTypeArguments(typeArguments); @@ -89,38 +84,44 @@ public FieldAccessExpr(TokenRange tokenRange, Expression scope, NodeList t customInitialization(); } + public static Expression allMemberAccess(TokenRange range, Expression scope) { + SimpleName fieldName = new SimpleName(range, "*"); + return new FieldAccessExpr(scope, null, fieldName); + } + @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldAccessExpr setName(final SimpleName name) { + public FieldAccessExpr setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getScope() { + public Expression getScope() { return scope; } @@ -131,20 +132,21 @@ public Expression getScope() { * @return this, the FieldAccessExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldAccessExpr setScope(final Expression scope) { + public FieldAccessExpr setScope(final Expression scope) { assertNotNull(scope); if (scope == this.scope) { return this; } notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope); - if (this.scope != null) this.scope.setParentNode(null); + if (this.scope != null) + this.scope.setParentNode(null); this.scope = scope; setAsParentNodeOf(scope); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -155,12 +157,13 @@ public Optional> getTypeArguments() { * @return this, the FieldAccessExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldAccessExpr setTypeArguments(final NodeList typeArguments) { + public FieldAccessExpr setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; @@ -168,19 +171,19 @@ public FieldAccessExpr setTypeArguments(final NodeList typeArguments) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public FieldAccessExpr clone() { + public FieldAccessExpr clone() { return (FieldAccessExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public FieldAccessExprMetaModel getMetaModel() { + public FieldAccessExprMetaModel getMetaModel() { return JavaParserMetaModel.fieldAccessExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -197,7 +200,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -222,19 +225,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isFieldAccessExpr() { + public boolean isFieldAccessExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public FieldAccessExpr asFieldAccessExpr() { + public FieldAccessExpr asFieldAccessExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifFieldAccessExpr(Consumer action) { + public void ifFieldAccessExpr(Consumer action) { action.accept(this); } @@ -252,27 +255,27 @@ public void ifFieldAccessExpr(Consumer action) { * @see ExplicitConstructorInvocationStmt#resolve() */ @Override - public ResolvedValueDeclaration resolve() { + public ResolvedValueDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedValueDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toFieldAccessExpr() { + public Optional toFieldAccessExpr() { return Optional.of(this); } /** * Indicate if this FieldAccessExpr is an element directly contained in a larger FieldAccessExpr. */ - public boolean isInternal() { + public boolean isInternal() { return this.getParentNode().isPresent() && this.getParentNode().get() instanceof FieldAccessExpr; } /** * Indicate if this FieldAccessExpr is top level, i.e., it is not directly contained in a larger FieldAccessExpr. */ - public boolean isTopLevel() { + public boolean isTopLevel() { return !isInternal(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java index 81a1d11991..49362dccb6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -95,8 +94,7 @@ * @see JEP305: https://bugs.openjdk.java.net/browse/JDK-8181287 * @see https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20 */ -public class InstanceOfExpr extends Expression - implements NodeWithType, NodeWithExpression { +public class InstanceOfExpr extends Expression implements NodeWithType, NodeWithExpression { private Expression expression; @@ -105,16 +103,16 @@ public class InstanceOfExpr extends Expression private ReferenceType type; - public InstanceOfExpr() { + public InstanceOfExpr() { this(null, new NameExpr(), new ClassOrInterfaceType(), null); } - public InstanceOfExpr(final Expression expression, final ReferenceType type) { + public InstanceOfExpr(final Expression expression, final ReferenceType type) { this(null, expression, type, null); } @AllFieldsConstructor - public InstanceOfExpr(final Expression expression, final ReferenceType type, final PatternExpr pattern) { + public InstanceOfExpr(final Expression expression, final ReferenceType type, final PatternExpr pattern) { this(null, expression, type, pattern); } @@ -122,7 +120,7 @@ public InstanceOfExpr(final Expression expression, final ReferenceType type, fin * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public InstanceOfExpr(TokenRange tokenRange, Expression expression, ReferenceType type, PatternExpr pattern) { + public InstanceOfExpr(TokenRange tokenRange, Expression expression, ReferenceType type, PatternExpr pattern) { super(tokenRange); setExpression(expression); setType(type); @@ -138,7 +136,7 @@ public InstanceOfExpr(TokenRange tokenRange, Expression expression, ReferenceTyp *
*
In this example, {@code getName()} returns {@code stringName} */ - public Optional getName() { + public Optional getName() { if (pattern == null) { return Optional.empty(); } @@ -150,64 +148,64 @@ public Optional getName() { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public InstanceOfExpr asInstanceOfExpr() { + public InstanceOfExpr asInstanceOfExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public InstanceOfExpr clone() { + public InstanceOfExpr clone() { return (InstanceOfExpr) accept(new CloneVisitor(), null); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public InstanceOfExprMetaModel getMetaModel() { + public InstanceOfExprMetaModel getMetaModel() { return JavaParserMetaModel.instanceOfExprMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getPattern() { + public Optional getPattern() { return Optional.ofNullable(pattern); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ReferenceType getType() { + public ReferenceType getType() { return type; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifInstanceOfExpr(Consumer action) { + public void ifInstanceOfExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isInstanceOfExpr() { + public boolean isInstanceOfExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -221,13 +219,13 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public InstanceOfExpr removePattern() { + public InstanceOfExpr removePattern() { return setPattern((PatternExpr) null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -249,38 +247,41 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public InstanceOfExpr setExpression(final Expression expression) { + public InstanceOfExpr setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public InstanceOfExpr setPattern(final PatternExpr pattern) { + public InstanceOfExpr setPattern(final PatternExpr pattern) { if (pattern == this.pattern) { return this; } notifyPropertyChange(ObservableProperty.PATTERN, this.pattern, pattern); - if (this.pattern != null) this.pattern.setParentNode(null); + if (this.pattern != null) + this.pattern.setParentNode(null); this.pattern = pattern; setAsParentNodeOf(pattern); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public InstanceOfExpr setType(final ReferenceType type) { + public InstanceOfExpr setType(final ReferenceType type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -288,7 +289,7 @@ public InstanceOfExpr setType(final ReferenceType type) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toInstanceOfExpr() { + public Optional toInstanceOfExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java index fbd386fc9b..590c5a7408 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.hasUnaryMinusAsParent; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -33,6 +32,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * All ways to specify an int literal. @@ -46,18 +46,18 @@ * * @author Julio Vilmar Gesser */ -public class IntegerLiteralExpr extends LiteralStringValueExpr { +public class IntegerLiteralExpr extends LiteralStringValueExpr { public static final String MAX_31_BIT_UNSIGNED_VALUE_AS_STRING = "2147483648"; public static final long MAX_31_BIT_UNSIGNED_VALUE_AS_LONG = 2147483648L; - public IntegerLiteralExpr() { + public IntegerLiteralExpr() { this(null, "0"); } @AllFieldsConstructor - public IntegerLiteralExpr(final String value) { + public IntegerLiteralExpr(final String value) { this(null, value); } @@ -65,7 +65,7 @@ public IntegerLiteralExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public IntegerLiteralExpr(TokenRange tokenRange, String value) { + public IntegerLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } @@ -75,19 +75,19 @@ public IntegerLiteralExpr(TokenRange tokenRange, String value) { * {@link #asNumber()} function for valid formats and how to construct literals holding negative values. */ @Deprecated - public IntegerLiteralExpr(final int value) { + public IntegerLiteralExpr(final int value) { this(null, String.valueOf(value)); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -98,7 +98,7 @@ public void accept(final VoidVisitor v, final A arg) { * future releases */ @Deprecated - public int asInt() { + public int asInt() { String result = value.replaceAll("_", ""); if (result.startsWith("0x") || result.startsWith("0X")) { return Integer.parseUnsignedInt(result.substring(2), 16); @@ -126,7 +126,7 @@ public int asInt() { * * @return the literal value as a number while respecting different number representations */ - public Number asNumber() { + public Number asNumber() { if (Objects.equals(value, MAX_31_BIT_UNSIGNED_VALUE_AS_STRING) && hasUnaryMinusAsParent(this)) { return MAX_31_BIT_UNSIGNED_VALUE_AS_LONG; } @@ -138,44 +138,44 @@ public Number asNumber() { * #asNumber()} function for valid formats and how to construct literals holding negative values. */ @Deprecated - public IntegerLiteralExpr setInt(int value) { + public IntegerLiteralExpr setInt(int value) { this.value = String.valueOf(value); return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public IntegerLiteralExpr clone() { + public IntegerLiteralExpr clone() { return (IntegerLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public IntegerLiteralExprMetaModel getMetaModel() { + public IntegerLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.integerLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIntegerLiteralExpr() { + public boolean isIntegerLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IntegerLiteralExpr asIntegerLiteralExpr() { + public IntegerLiteralExpr asIntegerLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIntegerLiteralExpr(Consumer action) { + public void ifIntegerLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIntegerLiteralExpr() { + public Optional toIntegerLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java index f5222f0df4..9b673b8753 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java @@ -21,16 +21,16 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.Parameter; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithParameters; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.stmt.BlockStmt; @@ -60,7 +60,7 @@ * * @author Raquel Pau */ -public class LambdaExpr extends Expression implements NodeWithParameters, NodeWithContracts { +public class LambdaExpr extends Expression implements NodeWithParameters, NodeWithContracts { private NodeList parameters; @@ -70,40 +70,40 @@ public class LambdaExpr extends Expression implements NodeWithParameters contracts = new NodeList<>(); - public LambdaExpr() { + public LambdaExpr() { this(null, new NodeList<>(), new ReturnStmt(), false); } /** * Creates a single parameter lambda expression. */ - public LambdaExpr(Parameter parameter, BlockStmt body) { + public LambdaExpr(Parameter parameter, BlockStmt body) { this(null, new NodeList<>(parameter), body, false); } /** * Creates a zero or multi-parameter lambda expression with its parameters wrapped in ( ). */ - public LambdaExpr(NodeList parameters, BlockStmt body) { + public LambdaExpr(NodeList parameters, BlockStmt body) { this(null, parameters, body, true); } /** * Creates a single parameter lambda expression. */ - public LambdaExpr(Parameter parameter, Expression body) { + public LambdaExpr(Parameter parameter, Expression body) { this(null, new NodeList<>(parameter), new ExpressionStmt(body), false); } /** * Creates a zero or multi-parameter lambda expression with its parameters wrapped in ( ). */ - public LambdaExpr(NodeList parameters, Expression body) { + public LambdaExpr(NodeList parameters, Expression body) { this(null, parameters, new ExpressionStmt(body), true); } @AllFieldsConstructor - public LambdaExpr(NodeList parameters, Statement body, boolean isEnclosingParameters) { + public LambdaExpr(NodeList parameters, Statement body, boolean isEnclosingParameters) { this(null, parameters, body, isEnclosingParameters); } @@ -111,8 +111,7 @@ public LambdaExpr(NodeList parameters, Statement body, boolean isEncl * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LambdaExpr( - TokenRange tokenRange, NodeList parameters, Statement body, boolean isEnclosingParameters) { + public LambdaExpr(TokenRange tokenRange, NodeList parameters, Statement body, boolean isEnclosingParameters) { super(tokenRange); setParameters(parameters); setBody(body); @@ -121,18 +120,19 @@ public LambdaExpr( } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getParameters() { + public NodeList getParameters() { return parameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LambdaExpr setParameters(final NodeList parameters) { + public LambdaExpr setParameters(final NodeList parameters) { assertNotNull(parameters); if (parameters == this.parameters) { return this; } notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters); - if (this.parameters != null) this.parameters.setParentNode(null); + if (this.parameters != null) + this.parameters.setParentNode(null); this.parameters = parameters; setAsParentNodeOf(parameters); return this; @@ -142,18 +142,19 @@ public LambdaExpr setParameters(final NodeList parameters) { * @return a BlockStatement or an ExpressionStatement. See class Javadoc. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getBody() { + public Statement getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LambdaExpr setBody(final Statement body) { + public LambdaExpr setBody(final Statement body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; @@ -161,35 +162,34 @@ public LambdaExpr setBody(final Statement body) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isEnclosingParameters() { + public boolean isEnclosingParameters() { return isEnclosingParameters; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LambdaExpr setEnclosingParameters(final boolean isEnclosingParameters) { + public LambdaExpr setEnclosingParameters(final boolean isEnclosingParameters) { if (isEnclosingParameters == this.isEnclosingParameters) { return this; } - notifyPropertyChange( - ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, isEnclosingParameters); + notifyPropertyChange(ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, isEnclosingParameters); this.isEnclosingParameters = isEnclosingParameters; return this; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -213,7 +213,7 @@ public boolean remove(Node node) { * Otherwise (when the body is a block) return Optional.empty(). */ @DerivedProperty - public Optional getExpressionBody() { + public Optional getExpressionBody() { if (body.isExpressionStmt()) { return Optional.of(body.asExpressionStmt().getExpression()); } @@ -222,19 +222,19 @@ public Optional getExpressionBody() { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LambdaExpr clone() { + public LambdaExpr clone() { return (LambdaExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LambdaExprMetaModel getMetaModel() { + public LambdaExprMetaModel getMetaModel() { return JavaParserMetaModel.lambdaExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -259,25 +259,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLambdaExpr() { + public boolean isLambdaExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LambdaExpr asLambdaExpr() { + public LambdaExpr asLambdaExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLambdaExpr(Consumer action) { + public void ifLambdaExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLambdaExpr() { + public Optional toLambdaExpr() { return Optional.of(this); } @@ -285,24 +285,24 @@ public Optional toLambdaExpr() { * Lambda expressions are always poly expressions */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { return true; } /* * Returns true if no type parameter has been defined */ - public boolean isExplicitlyTyped() { + public boolean isExplicitlyTyped() { return getParameters().stream().allMatch(p -> !(p.getType().isUnknownType())); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LambdaExpr setContracts(final NodeList contracts) { + public LambdaExpr setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java index 322367069c..b5bfe7ce4e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java @@ -38,7 +38,7 @@ public abstract class LiteralExpr extends Expression { @AllFieldsConstructor - public LiteralExpr() { + public LiteralExpr() { this(null); } @@ -46,44 +46,44 @@ public LiteralExpr() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LiteralExpr(TokenRange tokenRange) { + public LiteralExpr(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LiteralExpr clone() { + public LiteralExpr clone() { return (LiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LiteralExprMetaModel getMetaModel() { + public LiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.literalExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLiteralExpr() { + public boolean isLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LiteralExpr asLiteralExpr() { + public LiteralExpr asLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLiteralExpr(Consumer action) { + public void ifLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLiteralExpr() { + public Optional toLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java index 1192a18e45..59b021fd62 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -31,6 +30,7 @@ import com.github.javaparser.metamodel.LiteralStringValueExprMetaModel; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * Any literal value that is stored internally as a String. @@ -40,7 +40,7 @@ public abstract class LiteralStringValueExpr extends LiteralExpr { protected String value; @AllFieldsConstructor - public LiteralStringValueExpr(final String value) { + public LiteralStringValueExpr(final String value) { this(null, value); } @@ -48,19 +48,19 @@ public LiteralStringValueExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LiteralStringValueExpr(TokenRange tokenRange, String value) { + public LiteralStringValueExpr(TokenRange tokenRange, String value) { super(tokenRange); setValue(value); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public String getValue() { + public String getValue() { return value; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LiteralStringValueExpr setValue(final String value) { + public LiteralStringValueExpr setValue(final String value) { assertNotNull(value); if (value == this.value) { return this; @@ -72,37 +72,37 @@ public LiteralStringValueExpr setValue(final String value) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LiteralStringValueExpr clone() { + public LiteralStringValueExpr clone() { return (LiteralStringValueExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LiteralStringValueExprMetaModel getMetaModel() { + public LiteralStringValueExprMetaModel getMetaModel() { return JavaParserMetaModel.literalStringValueExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLiteralStringValueExpr() { + public boolean isLiteralStringValueExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LiteralStringValueExpr asLiteralStringValueExpr() { + public LiteralStringValueExpr asLiteralStringValueExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLiteralStringValueExpr(Consumer action) { + public void ifLiteralStringValueExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLiteralStringValueExpr() { + public Optional toLiteralStringValueExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java index 8ec85caa5d..aa0399981d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.hasUnaryMinusAsParent; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -34,6 +33,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * All ways to specify a long literal. @@ -48,18 +48,18 @@ * * @author Julio Vilmar Gesser */ -public class LongLiteralExpr extends LiteralStringValueExpr { +public class LongLiteralExpr extends LiteralStringValueExpr { public static final String MAX_63_BIT_UNSIGNED_VALUE_AS_STRING = "9223372036854775808L"; public static final BigInteger MAX_63_BIT_UNSIGNED_VALUE_AS_BIG_INTEGER = new BigInteger("9223372036854775808"); - public LongLiteralExpr() { + public LongLiteralExpr() { this(null, "0"); } @AllFieldsConstructor - public LongLiteralExpr(final String value) { + public LongLiteralExpr(final String value) { this(null, value); } @@ -67,7 +67,7 @@ public LongLiteralExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LongLiteralExpr(TokenRange tokenRange, String value) { + public LongLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } @@ -77,19 +77,19 @@ public LongLiteralExpr(TokenRange tokenRange, String value) { * #asNumber()} function for valid formats and how to construct literals holding negative values. */ @Deprecated - public LongLiteralExpr(final long value) { + public LongLiteralExpr(final long value) { this(null, String.valueOf(value)); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -100,7 +100,7 @@ public void accept(final VoidVisitor v, final A arg) { * releases */ @Deprecated - public long asLong() { + public long asLong() { String result = value.replaceAll("_", ""); char lastChar = result.charAt(result.length() - 1); if (lastChar == 'l' || lastChar == 'L') { @@ -133,7 +133,7 @@ public long asLong() { * * @return the literal value as a number while respecting different number representations */ - public Number asNumber() { + public Number asNumber() { if (Objects.equals(value, MAX_63_BIT_UNSIGNED_VALUE_AS_STRING) && hasUnaryMinusAsParent(this)) { return MAX_63_BIT_UNSIGNED_VALUE_AS_BIG_INTEGER; } @@ -145,44 +145,44 @@ public Number asNumber() { * #asNumber()} function for valid formats and how to construct literals holding negative values. */ @Deprecated - public LongLiteralExpr setLong(long value) { + public LongLiteralExpr setLong(long value) { this.value = String.valueOf(value); return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LongLiteralExpr clone() { + public LongLiteralExpr clone() { return (LongLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LongLiteralExprMetaModel getMetaModel() { + public LongLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.longLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLongLiteralExpr() { + public boolean isLongLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LongLiteralExpr asLongLiteralExpr() { + public LongLiteralExpr asLongLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLongLiteralExpr(Consumer action) { + public void ifLongLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLongLiteralExpr() { + public Optional toLongLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java index 277db2f286..faa72c7eef 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.StaticJavaParser.parseName; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -32,6 +31,7 @@ import com.github.javaparser.metamodel.MarkerAnnotationExprMetaModel; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * An annotation that uses only the annotation type name. @@ -39,18 +39,18 @@ * * @author Julio Vilmar Gesser */ -public class MarkerAnnotationExpr extends AnnotationExpr { +public class MarkerAnnotationExpr extends AnnotationExpr { - public MarkerAnnotationExpr() { + public MarkerAnnotationExpr() { this(null, new Name()); } - public MarkerAnnotationExpr(final String name) { + public MarkerAnnotationExpr(final String name) { this(null, parseName(name)); } @AllFieldsConstructor - public MarkerAnnotationExpr(final Name name) { + public MarkerAnnotationExpr(final Name name) { this(null, name); } @@ -58,56 +58,56 @@ public MarkerAnnotationExpr(final Name name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public MarkerAnnotationExpr(TokenRange tokenRange, Name name) { + public MarkerAnnotationExpr(TokenRange tokenRange, Name name) { super(tokenRange, name); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public MarkerAnnotationExpr clone() { + public MarkerAnnotationExpr clone() { return (MarkerAnnotationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public MarkerAnnotationExprMetaModel getMetaModel() { + public MarkerAnnotationExprMetaModel getMetaModel() { return JavaParserMetaModel.markerAnnotationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMarkerAnnotationExpr() { + public boolean isMarkerAnnotationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MarkerAnnotationExpr asMarkerAnnotationExpr() { + public MarkerAnnotationExpr asMarkerAnnotationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMarkerAnnotationExpr(Consumer action) { + public void ifMarkerAnnotationExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMarkerAnnotationExpr() { + public Optional toMarkerAnnotationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java index 70a394fbae..aa17aa4ad0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -40,22 +39,22 @@ * * @author Julio Vilmar Gesser */ -public class MemberValuePair extends Node implements NodeWithSimpleName { +public class MemberValuePair extends Node implements NodeWithSimpleName { private SimpleName name; private Expression value; - public MemberValuePair() { + public MemberValuePair() { this(null, new SimpleName(), new StringLiteralExpr()); } - public MemberValuePair(final String name, final Expression value) { + public MemberValuePair(final String name, final Expression value) { this(null, new SimpleName(name), value); } @AllFieldsConstructor - public MemberValuePair(final SimpleName name, final Expression value) { + public MemberValuePair(final SimpleName name, final Expression value) { this(null, name, value); } @@ -63,7 +62,7 @@ public MemberValuePair(final SimpleName name, final Expression value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public MemberValuePair(TokenRange tokenRange, SimpleName name, Expression value) { + public MemberValuePair(TokenRange tokenRange, SimpleName name, Expression value) { super(tokenRange); setName(name); setValue(value); @@ -72,47 +71,49 @@ public MemberValuePair(TokenRange tokenRange, SimpleName name, Expression value) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getValue() { + public Expression getValue() { return value; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MemberValuePair setName(final SimpleName name) { + public MemberValuePair setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MemberValuePair setValue(final Expression value) { + public MemberValuePair setValue(final Expression value) { assertNotNull(value); if (value == this.value) { return this; } notifyPropertyChange(ObservableProperty.VALUE, this.value, value); - if (this.value != null) this.value.setParentNode(null); + if (this.value != null) + this.value.setParentNode(null); this.value = value; setAsParentNodeOf(value); return this; @@ -120,19 +121,19 @@ public MemberValuePair setValue(final Expression value) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public MemberValuePair clone() { + public MemberValuePair clone() { return (MemberValuePair) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public MemberValuePairMetaModel getMetaModel() { + public MemberValuePairMetaModel getMetaModel() { return JavaParserMetaModel.memberValuePairMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java index 4041a8bf2d..ea5be04c5d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -53,12 +52,7 @@ * * @author Julio Vilmar Gesser */ -public class MethodCallExpr extends Expression - implements NodeWithTypeArguments, - NodeWithArguments, - NodeWithSimpleName, - NodeWithOptionalScope, - Resolvable { +public class MethodCallExpr extends Expression implements NodeWithTypeArguments, NodeWithArguments, NodeWithSimpleName, NodeWithOptionalScope, Resolvable { @OptionalProperty private Expression scope; @@ -70,44 +64,36 @@ public class MethodCallExpr extends Expression private NodeList arguments; - public MethodCallExpr() { + public MethodCallExpr() { this(null, null, null, new SimpleName(), new NodeList<>()); } - public MethodCallExpr(String name, Expression... arguments) { + public MethodCallExpr(String name, Expression... arguments) { this(null, null, null, new SimpleName(name), new NodeList<>(arguments)); } - public MethodCallExpr(final Expression scope, final String name) { + public MethodCallExpr(final Expression scope, final String name) { this(null, scope, null, new SimpleName(name), new NodeList<>()); } - public MethodCallExpr(final Expression scope, final SimpleName name) { + public MethodCallExpr(final Expression scope, final SimpleName name) { this(null, scope, null, name, new NodeList<>()); } - public MethodCallExpr(final Expression scope, final String name, final NodeList arguments) { + public MethodCallExpr(final Expression scope, final String name, final NodeList arguments) { this(null, scope, null, new SimpleName(name), arguments); } - public MethodCallExpr( - final Expression scope, - final NodeList typeArguments, - final String name, - final NodeList arguments) { + public MethodCallExpr(final Expression scope, final NodeList typeArguments, final String name, final NodeList arguments) { this(null, scope, typeArguments, new SimpleName(name), arguments); } - public MethodCallExpr(final Expression scope, final SimpleName name, final NodeList arguments) { + public MethodCallExpr(final Expression scope, final SimpleName name, final NodeList arguments) { this(null, scope, null, name, arguments); } @AllFieldsConstructor - public MethodCallExpr( - final Expression scope, - final NodeList typeArguments, - final SimpleName name, - final NodeList arguments) { + public MethodCallExpr(final Expression scope, final NodeList typeArguments, final SimpleName name, final NodeList arguments) { this(null, scope, typeArguments, name, arguments); } @@ -115,12 +101,7 @@ public MethodCallExpr( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public MethodCallExpr( - TokenRange tokenRange, - Expression scope, - NodeList typeArguments, - SimpleName name, - NodeList arguments) { + public MethodCallExpr(TokenRange tokenRange, Expression scope, NodeList typeArguments, SimpleName name, NodeList arguments) { super(tokenRange); setScope(scope); setTypeArguments(typeArguments); @@ -131,71 +112,74 @@ public MethodCallExpr( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getArguments() { + public NodeList getArguments() { return arguments; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getScope() { + public Optional getScope() { return Optional.ofNullable(scope); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodCallExpr setArguments(final NodeList arguments) { + public MethodCallExpr setArguments(final NodeList arguments) { assertNotNull(arguments); if (arguments == this.arguments) { return this; } notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments); - if (this.arguments != null) this.arguments.setParentNode(null); + if (this.arguments != null) + this.arguments.setParentNode(null); this.arguments = arguments; setAsParentNodeOf(arguments); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodCallExpr setName(final SimpleName name) { + public MethodCallExpr setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodCallExpr setScope(final Expression scope) { + public MethodCallExpr setScope(final Expression scope) { if (scope == this.scope) { return this; } notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope); - if (this.scope != null) this.scope.setParentNode(null); + if (this.scope != null) + this.scope.setParentNode(null); this.scope = scope; setAsParentNodeOf(scope); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -206,12 +190,13 @@ public Optional> getTypeArguments() { * @return this, the MethodCallExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodCallExpr setTypeArguments(final NodeList typeArguments) { + public MethodCallExpr setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; @@ -219,7 +204,7 @@ public MethodCallExpr setTypeArguments(final NodeList typeArguments) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -247,25 +232,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public MethodCallExpr removeScope() { + public MethodCallExpr removeScope() { return setScope((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public MethodCallExpr clone() { + public MethodCallExpr clone() { return (MethodCallExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public MethodCallExprMetaModel getMetaModel() { + public MethodCallExprMetaModel getMetaModel() { return JavaParserMetaModel.methodCallExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -298,19 +283,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodCallExpr() { + public boolean isMethodCallExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodCallExpr asMethodCallExpr() { + public MethodCallExpr asMethodCallExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodCallExpr(Consumer action) { + public void ifMethodCallExpr(Consumer action) { action.accept(this); } @@ -328,13 +313,13 @@ public void ifMethodCallExpr(Consumer action) { * @see ExplicitConstructorInvocationStmt#resolve() */ @Override - public ResolvedMethodDeclaration resolve() { + public ResolvedMethodDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedMethodDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodCallExpr() { + public Optional toMethodCallExpr() { return Optional.of(this); } @@ -348,7 +333,7 @@ public Optional toMethodCallExpr() { * Otherwise, the method invocation expression is a standalone expression. */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { // A method invocation expression is a poly expression if all of the following are true: // // 1. The invocation appears in an assignment context or an invocation context (§5.2, §5.3). @@ -363,8 +348,7 @@ public boolean isPolyExpression() { // 3. The method to be invoked, as determined by the following subsections, is generic (§8.4.4) and has a // return type that mentions at least one of the method's type parameters. // A method is generic if it declares one or more type variables (§4.4). - if (isGenericMethod() - && hasParameterwithSameTypeThanResultType(resolve().getReturnType())) { + if (isGenericMethod() && hasParameterwithSameTypeThanResultType(resolve().getReturnType())) { // it's a poly expression return true; } @@ -384,9 +368,7 @@ private boolean isGenericMethod() { * return true if at least one of the method's type parameters has the same type as the specified type . */ private boolean hasParameterwithSameTypeThanResultType(ResolvedType resolvedReturnType) { - return getTypeArguments().isPresent() - && getTypeArguments().get().stream() - .anyMatch(argType -> argType.resolve().isAssignableBy(resolvedReturnType)); + return getTypeArguments().isPresent() && getTypeArguments().get().stream().anyMatch(argType -> argType.resolve().isAssignableBy(resolvedReturnType)); } /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java index f5a2fd85d1..a3dc4553a7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java @@ -38,10 +38,8 @@ import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNonEmpty; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -56,10 +54,7 @@ * * @author Raquel Pau */ -public class MethodReferenceExpr extends Expression - implements NodeWithTypeArguments, - NodeWithIdentifier, - Resolvable { +public class MethodReferenceExpr extends Expression implements NodeWithTypeArguments, NodeWithIdentifier, Resolvable { private Expression scope; @@ -69,12 +64,12 @@ public class MethodReferenceExpr extends Expression @NonEmptyProperty private String identifier; - public MethodReferenceExpr() { + public MethodReferenceExpr() { this(null, new ClassExpr(), null, "empty"); } @AllFieldsConstructor - public MethodReferenceExpr(Expression scope, NodeList typeArguments, String identifier) { + public MethodReferenceExpr(Expression scope, NodeList typeArguments, String identifier) { this(null, scope, typeArguments, identifier); } @@ -82,8 +77,7 @@ public MethodReferenceExpr(Expression scope, NodeList typeArguments, Strin * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public MethodReferenceExpr( - TokenRange tokenRange, Expression scope, NodeList typeArguments, String identifier) { + public MethodReferenceExpr(TokenRange tokenRange, Expression scope, NodeList typeArguments, String identifier) { super(tokenRange); setScope(scope); setTypeArguments(typeArguments); @@ -93,36 +87,37 @@ public MethodReferenceExpr( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getScope() { + public Expression getScope() { return scope; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodReferenceExpr setScope(final Expression scope) { + public MethodReferenceExpr setScope(final Expression scope) { assertNotNull(scope); if (scope == this.scope) { return this; } notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope); - if (this.scope != null) this.scope.setParentNode(null); + if (this.scope != null) + this.scope.setParentNode(null); this.scope = scope; setAsParentNodeOf(scope); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -133,24 +128,25 @@ public Optional> getTypeArguments() { * @return this, the MethodReferenceExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodReferenceExpr setTypeArguments(final NodeList typeArguments) { + public MethodReferenceExpr setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public String getIdentifier() { + public String getIdentifier() { return identifier; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodReferenceExpr setIdentifier(final String identifier) { + public MethodReferenceExpr setIdentifier(final String identifier) { assertNonEmpty(identifier); if (identifier == this.identifier) { return this; @@ -162,7 +158,7 @@ public MethodReferenceExpr setIdentifier(final String identifier) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -179,19 +175,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public MethodReferenceExpr clone() { + public MethodReferenceExpr clone() { return (MethodReferenceExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public MethodReferenceExprMetaModel getMetaModel() { + public MethodReferenceExprMetaModel getMetaModel() { return JavaParserMetaModel.methodReferenceExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -212,25 +208,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isMethodReferenceExpr() { + public boolean isMethodReferenceExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public MethodReferenceExpr asMethodReferenceExpr() { + public MethodReferenceExpr asMethodReferenceExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifMethodReferenceExpr(Consumer action) { + public void ifMethodReferenceExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toMethodReferenceExpr() { + public Optional toMethodReferenceExpr() { return Optional.of(this); } @@ -238,7 +234,7 @@ public Optional toMethodReferenceExpr() { * @return the method declaration this method reference is referencing. */ @Override - public ResolvedMethodDeclaration resolve() { + public ResolvedMethodDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedMethodDeclaration.class); } @@ -247,7 +243,7 @@ public ResolvedMethodDeclaration resolve() { * (https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html 15.13. Method Reference Expressions) */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { return true; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java index af271491ce..2ab78f988f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java @@ -33,9 +33,7 @@ import com.github.javaparser.metamodel.NameMetaModel; import com.github.javaparser.metamodel.NonEmptyProperty; import com.github.javaparser.metamodel.OptionalProperty; - import java.util.Optional; - import static com.github.javaparser.utils.Utils.assertNonEmpty; /** @@ -50,7 +48,7 @@ * @author Julio Vilmar Gesser * @see SimpleName */ -public class Name extends Node implements NodeWithIdentifier { +public class Name extends Node implements NodeWithIdentifier { @NonEmptyProperty private String identifier; @@ -58,16 +56,16 @@ public class Name extends Node implements NodeWithIdentifier { @OptionalProperty private Name qualifier; - public Name() { + public Name() { this(null, null, "empty"); } - public Name(final String identifier) { + public Name(final String identifier) { this(null, null, identifier); } @AllFieldsConstructor - public Name(Name qualifier, final String identifier) { + public Name(Name qualifier, final String identifier) { this(null, qualifier, identifier); } @@ -75,7 +73,7 @@ public Name(Name qualifier, final String identifier) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Name(TokenRange tokenRange, Name qualifier, String identifier) { + public Name(TokenRange tokenRange, Name qualifier, String identifier) { super(tokenRange); setQualifier(qualifier); setIdentifier(identifier); @@ -84,23 +82,23 @@ public Name(TokenRange tokenRange, Name qualifier, String identifier) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public String getIdentifier() { + public String getIdentifier() { return identifier; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name setIdentifier(final String identifier) { + public Name setIdentifier(final String identifier) { assertNonEmpty(identifier); if (identifier == this.identifier) { return this; @@ -113,7 +111,7 @@ public Name setIdentifier(final String identifier) { /** * @return the complete qualified name. Only the identifiers and the dots, so no comments or whitespace. */ - public String asString() { + public String asString() { if (qualifier != null) { return qualifier.asString() + "." + identifier; } @@ -121,17 +119,18 @@ public String asString() { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getQualifier() { + public Optional getQualifier() { return Optional.ofNullable(qualifier); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name setQualifier(final Name qualifier) { + public Name setQualifier(final Name qualifier) { if (qualifier == this.qualifier) { return this; } notifyPropertyChange(ObservableProperty.QUALIFIER, this.qualifier, qualifier); - if (this.qualifier != null) this.qualifier.setParentNode(null); + if (this.qualifier != null) + this.qualifier.setParentNode(null); this.qualifier = qualifier; setAsParentNodeOf(qualifier); return this; @@ -139,7 +138,7 @@ public Name setQualifier(final Name qualifier) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -153,25 +152,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public Name removeQualifier() { + public Name removeQualifier() { return setQualifier((Name) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Name clone() { + public Name clone() { return (Name) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public NameMetaModel getMetaModel() { + public NameMetaModel getMetaModel() { return JavaParserMetaModel.nameMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -187,14 +186,14 @@ public boolean replace(Node node, Node replacementNode) { /** * A top level name is a name that is not contained in a larger Name instance. */ - public boolean isTopLevel() { + public boolean isTopLevel() { return !isInternal(); } /** * An internal name is a name that constitutes a part of a larger Name instance. */ - public boolean isInternal() { + public boolean isInternal() { return getParentNode().filter(parent -> parent instanceof Name).isPresent(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java index ed66c67835..1872b2cabf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java @@ -35,10 +35,8 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -47,20 +45,20 @@ * * @author Julio Vilmar Gesser */ -public class NameExpr extends Expression implements NodeWithSimpleName, Resolvable { +public class NameExpr extends Expression implements NodeWithSimpleName, Resolvable { private SimpleName name; - public NameExpr() { + public NameExpr() { this(null, new SimpleName()); } - public NameExpr(final String name) { + public NameExpr(final String name) { this(null, new SimpleName(name)); } @AllFieldsConstructor - public NameExpr(final SimpleName name) { + public NameExpr(final SimpleName name) { this(name.getTokenRange().orElse(null), name); setRange(name.getRange().orElse(null)); } @@ -69,7 +67,7 @@ public NameExpr(final SimpleName name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public NameExpr(TokenRange tokenRange, SimpleName name) { + public NameExpr(TokenRange tokenRange, SimpleName name) { super(tokenRange); setName(name); customInitialization(); @@ -77,29 +75,30 @@ public NameExpr(TokenRange tokenRange, SimpleName name) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NameExpr setName(final SimpleName name) { + public NameExpr setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -107,19 +106,19 @@ public NameExpr setName(final SimpleName name) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public NameExpr clone() { + public NameExpr clone() { return (NameExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public NameExprMetaModel getMetaModel() { + public NameExprMetaModel getMetaModel() { return JavaParserMetaModel.nameExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -132,19 +131,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNameExpr() { + public boolean isNameExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NameExpr asNameExpr() { + public NameExpr asNameExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNameExpr(Consumer action) { + public void ifNameExpr(Consumer action) { action.accept(this); } @@ -161,13 +160,13 @@ public void ifNameExpr(Consumer action) { * @see ExplicitConstructorInvocationStmt#resolve() */ @Override - public ResolvedValueDeclaration resolve() { + public ResolvedValueDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedValueDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNameExpr() { + public Optional toNameExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java index 6815d376af..9f29ed3004 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java @@ -31,10 +31,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.NormalAnnotationExprMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -42,16 +40,16 @@ * * @author Julio Vilmar Gesser */ -public class NormalAnnotationExpr extends AnnotationExpr { +public class NormalAnnotationExpr extends AnnotationExpr { private NodeList pairs; - public NormalAnnotationExpr() { + public NormalAnnotationExpr() { this(null, new Name(), new NodeList<>()); } @AllFieldsConstructor - public NormalAnnotationExpr(final Name name, final NodeList pairs) { + public NormalAnnotationExpr(final Name name, final NodeList pairs) { this(null, name, pairs); } @@ -59,7 +57,7 @@ public NormalAnnotationExpr(final Name name, final NodeList pai * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public NormalAnnotationExpr(TokenRange tokenRange, Name name, NodeList pairs) { + public NormalAnnotationExpr(TokenRange tokenRange, Name name, NodeList pairs) { super(tokenRange, name); setPairs(pairs); customInitialization(); @@ -67,29 +65,30 @@ public NormalAnnotationExpr(TokenRange tokenRange, Name name, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getPairs() { + public NodeList getPairs() { return pairs; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NormalAnnotationExpr setPairs(final NodeList pairs) { + public NormalAnnotationExpr setPairs(final NodeList pairs) { assertNotNull(pairs); if (pairs == this.pairs) { return this; } notifyPropertyChange(ObservableProperty.PAIRS, this.pairs, pairs); - if (this.pairs != null) this.pairs.setParentNode(null); + if (this.pairs != null) + this.pairs.setParentNode(null); this.pairs = pairs; setAsParentNodeOf(pairs); return this; @@ -100,7 +99,7 @@ public NormalAnnotationExpr setPairs(final NodeList pairs) { * * @return this, the {@link NormalAnnotationExpr} */ - public NormalAnnotationExpr addPair(String key, String value) { + public NormalAnnotationExpr addPair(String key, String value) { return addPair(key, new NameExpr(value)); } @@ -109,7 +108,7 @@ public NormalAnnotationExpr addPair(String key, String value) { * * @return this, the {@link NormalAnnotationExpr} */ - public NormalAnnotationExpr addPair(String key, Expression value) { + public NormalAnnotationExpr addPair(String key, Expression value) { MemberValuePair memberValuePair = new MemberValuePair(key, value); getPairs().add(memberValuePair); return this; @@ -117,7 +116,7 @@ public NormalAnnotationExpr addPair(String key, Expression value) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -132,19 +131,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public NormalAnnotationExpr clone() { + public NormalAnnotationExpr clone() { return (NormalAnnotationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public NormalAnnotationExprMetaModel getMetaModel() { + public NormalAnnotationExprMetaModel getMetaModel() { return JavaParserMetaModel.normalAnnotationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -159,25 +158,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNormalAnnotationExpr() { + public boolean isNormalAnnotationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NormalAnnotationExpr asNormalAnnotationExpr() { + public NormalAnnotationExpr asNormalAnnotationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNormalAnnotationExpr(Consumer action) { + public void ifNormalAnnotationExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNormalAnnotationExpr() { + public Optional toNormalAnnotationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java index 734c1bf963..38da09c3a9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java @@ -38,10 +38,10 @@ * * @author Julio Vilmar Gesser */ -public class NullLiteralExpr extends LiteralExpr { +public class NullLiteralExpr extends LiteralExpr { @AllFieldsConstructor - public NullLiteralExpr() { + public NullLiteralExpr() { this(null); } @@ -49,56 +49,56 @@ public NullLiteralExpr() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public NullLiteralExpr(TokenRange tokenRange) { + public NullLiteralExpr(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public NullLiteralExpr clone() { + public NullLiteralExpr clone() { return (NullLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public NullLiteralExprMetaModel getMetaModel() { + public NullLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.nullLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isNullLiteralExpr() { + public boolean isNullLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public NullLiteralExpr asNullLiteralExpr() { + public NullLiteralExpr asNullLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifNullLiteralExpr(Consumer action) { + public void ifNullLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toNullLiteralExpr() { + public Optional toNullLiteralExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java index ca142b58cd..421765a6fd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java @@ -43,10 +43,8 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -59,12 +57,7 @@ * * @author Julio Vilmar Gesser */ -public class ObjectCreationExpr extends Expression - implements NodeWithTypeArguments, - NodeWithType, - NodeWithArguments, - NodeWithOptionalScope, - Resolvable { +public class ObjectCreationExpr extends Expression implements NodeWithTypeArguments, NodeWithType, NodeWithArguments, NodeWithOptionalScope, Resolvable { @OptionalProperty private Expression scope; @@ -79,7 +72,7 @@ public class ObjectCreationExpr extends Expression @OptionalProperty private NodeList> anonymousClassBody; - public ObjectCreationExpr() { + public ObjectCreationExpr() { this(null, null, new ClassOrInterfaceType(), new NodeList<>(), new NodeList<>(), null); } @@ -90,18 +83,12 @@ public ObjectCreationExpr() { * @param type this is the class that the constructor is being called for. * @param arguments Any arguments to pass to the constructor */ - public ObjectCreationExpr( - final Expression scope, final ClassOrInterfaceType type, final NodeList arguments) { + public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final NodeList arguments) { this(null, scope, type, null, arguments, null); } @AllFieldsConstructor - public ObjectCreationExpr( - final Expression scope, - final ClassOrInterfaceType type, - final NodeList typeArguments, - final NodeList arguments, - final NodeList> anonymousClassBody) { + public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final NodeList typeArguments, final NodeList arguments, final NodeList> anonymousClassBody) { this(null, scope, type, typeArguments, arguments, anonymousClassBody); } @@ -109,13 +96,7 @@ public ObjectCreationExpr( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ObjectCreationExpr( - TokenRange tokenRange, - Expression scope, - ClassOrInterfaceType type, - NodeList typeArguments, - NodeList arguments, - NodeList> anonymousClassBody) { + public ObjectCreationExpr(TokenRange tokenRange, Expression scope, ClassOrInterfaceType type, NodeList typeArguments, NodeList arguments, NodeList> anonymousClassBody) { super(tokenRange); setScope(scope); setType(type); @@ -127,38 +108,39 @@ public ObjectCreationExpr( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional>> getAnonymousClassBody() { + public Optional>> getAnonymousClassBody() { return Optional.ofNullable(anonymousClassBody); } - public void addAnonymousClassBody(BodyDeclaration body) { - if (anonymousClassBody == null) anonymousClassBody = new NodeList<>(); + public void addAnonymousClassBody(BodyDeclaration body) { + if (anonymousClassBody == null) + anonymousClassBody = new NodeList<>(); anonymousClassBody.add(body); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getArguments() { + public NodeList getArguments() { return arguments; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getScope() { + public Optional getScope() { return Optional.ofNullable(scope); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceType getType() { + public ClassOrInterfaceType getType() { return type; } @@ -171,25 +153,27 @@ public ClassOrInterfaceType getType() { * @return this, the ObjectCreationExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ObjectCreationExpr setAnonymousClassBody(final NodeList> anonymousClassBody) { + public ObjectCreationExpr setAnonymousClassBody(final NodeList> anonymousClassBody) { if (anonymousClassBody == this.anonymousClassBody) { return this; } notifyPropertyChange(ObservableProperty.ANONYMOUS_CLASS_BODY, this.anonymousClassBody, anonymousClassBody); - if (this.anonymousClassBody != null) this.anonymousClassBody.setParentNode(null); + if (this.anonymousClassBody != null) + this.anonymousClassBody.setParentNode(null); this.anonymousClassBody = anonymousClassBody; setAsParentNodeOf(anonymousClassBody); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ObjectCreationExpr setArguments(final NodeList arguments) { + public ObjectCreationExpr setArguments(final NodeList arguments) { assertNotNull(arguments); if (arguments == this.arguments) { return this; } notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments); - if (this.arguments != null) this.arguments.setParentNode(null); + if (this.arguments != null) + this.arguments.setParentNode(null); this.arguments = arguments; setAsParentNodeOf(arguments); return this; @@ -202,32 +186,34 @@ public ObjectCreationExpr setArguments(final NodeList arguments) { * @return this, the ObjectCreationExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ObjectCreationExpr setScope(final Expression scope) { + public ObjectCreationExpr setScope(final Expression scope) { if (scope == this.scope) { return this; } notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope); - if (this.scope != null) this.scope.setParentNode(null); + if (this.scope != null) + this.scope.setParentNode(null); this.scope = scope; setAsParentNodeOf(scope); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ObjectCreationExpr setType(final ClassOrInterfaceType type) { + public ObjectCreationExpr setType(final ClassOrInterfaceType type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -238,12 +224,13 @@ public Optional> getTypeArguments() { * @return this, the ObjectCreationExpr */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ObjectCreationExpr setTypeArguments(final NodeList typeArguments) { + public ObjectCreationExpr setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; @@ -251,7 +238,7 @@ public ObjectCreationExpr setTypeArguments(final NodeList typeArguments) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -287,25 +274,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ObjectCreationExpr removeScope() { + public ObjectCreationExpr removeScope() { return setScope((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ObjectCreationExpr clone() { + public ObjectCreationExpr clone() { return (ObjectCreationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ObjectCreationExprMetaModel getMetaModel() { + public ObjectCreationExprMetaModel getMetaModel() { return JavaParserMetaModel.objectCreationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -346,19 +333,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isObjectCreationExpr() { + public boolean isObjectCreationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ObjectCreationExpr asObjectCreationExpr() { + public ObjectCreationExpr asObjectCreationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifObjectCreationExpr(Consumer action) { + public void ifObjectCreationExpr(Consumer action) { action.accept(this); } @@ -376,13 +363,13 @@ public void ifObjectCreationExpr(Consumer action) { * @see ExplicitConstructorInvocationStmt#resolve() */ @Override - public ResolvedConstructorDeclaration resolve() { + public ResolvedConstructorDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedConstructorDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toObjectCreationExpr() { + public Optional toObjectCreationExpr() { return Optional.of(this); } @@ -392,7 +379,7 @@ public Optional toObjectCreationExpr() { * Otherwise, it is a standalone expression. */ @Override - public boolean isPolyExpression() { + public boolean isPolyExpression() { return isUsingDiamondOperator() && (appearsInInvocationContext() || appearsInAssignmentContext()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java index 08588e3658..41985711c9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java @@ -28,15 +28,14 @@ import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.ReferenceType; +import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.PatternExprMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -75,41 +74,42 @@ public abstract class PatternExpr extends Expression implements NodeWithType toPatternExpr() { + public Optional toPatternExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifPatternExpr(Consumer action) { + public void ifPatternExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public PatternExpr clone() { + public PatternExpr clone() { return (PatternExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public PatternExprMetaModel getMetaModel() { + public PatternExprMetaModel getMetaModel() { return JavaParserMetaModel.patternExprMetaModel; } @@ -117,19 +117,20 @@ public PatternExprMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public PatternExpr(TokenRange tokenRange) { + public PatternExpr(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public PatternExpr setType(final Type type) { + public PatternExpr setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -140,13 +141,13 @@ public PatternExpr setType(final Type type) { * can also have primitive types. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -161,7 +162,7 @@ public boolean replace(Node node, Node replacementNode) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public PatternExpr(TokenRange tokenRange, Type type) { + public PatternExpr(TokenRange tokenRange, Type type) { super(tokenRange); setType(type); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java index 429889e350..5f5423a09d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java @@ -20,7 +20,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -76,19 +75,18 @@ * @see com.github.javaparser.ast.expr.TypePatternExpr * @see JEP 440: Record Patterns */ -public class RecordPatternExpr extends PatternExpr implements NodeWithFinalModifier { +public class RecordPatternExpr extends PatternExpr implements NodeWithFinalModifier { private NodeList modifiers; private NodeList patternList; - public RecordPatternExpr() { + public RecordPatternExpr() { this(new NodeList<>(), new ClassOrInterfaceType(), new NodeList<>()); } @AllFieldsConstructor - public RecordPatternExpr( - final NodeList modifiers, final Type type, final NodeList patternList) { + public RecordPatternExpr(final NodeList modifiers, final Type type, final NodeList patternList) { this(null, modifiers, type, patternList); } @@ -97,35 +95,36 @@ public RecordPatternExpr( * types. */ @Override - public ReferenceType getType() { + public ReferenceType getType() { return super.getType().asReferenceType(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordPatternExpr setModifiers(final NodeList modifiers) { + public RecordPatternExpr setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; @@ -133,41 +132,42 @@ public RecordPatternExpr setModifiers(final NodeList modifiers) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isRecordPatternExpr() { + public boolean isRecordPatternExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public RecordPatternExpr asRecordPatternExpr() { + public RecordPatternExpr asRecordPatternExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toRecordPatternExpr() { + public Optional toRecordPatternExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifRecordPatternExpr(Consumer action) { + public void ifRecordPatternExpr(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getPatternList() { + public NodeList getPatternList() { return patternList; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordPatternExpr setPatternList(final NodeList patternList) { + public RecordPatternExpr setPatternList(final NodeList patternList) { assertNotNull(patternList); if (patternList == this.patternList) { return this; } notifyPropertyChange(ObservableProperty.PATTERN_LIST, this.patternList, patternList); - if (this.patternList != null) this.patternList.setParentNode(null); + if (this.patternList != null) + this.patternList.setParentNode(null); this.patternList = patternList; setAsParentNodeOf(patternList); return this; @@ -175,7 +175,7 @@ public RecordPatternExpr setPatternList(final NodeList patternList) @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -196,7 +196,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -217,13 +217,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public RecordPatternExpr clone() { + public RecordPatternExpr clone() { return (RecordPatternExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public RecordPatternExprMetaModel getMetaModel() { + public RecordPatternExprMetaModel getMetaModel() { return JavaParserMetaModel.recordPatternExprMetaModel; } @@ -231,8 +231,7 @@ public RecordPatternExprMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public RecordPatternExpr( - TokenRange tokenRange, NodeList modifiers, Type type, NodeList patternList) { + public RecordPatternExpr(TokenRange tokenRange, NodeList modifiers, Type type, NodeList patternList) { super(tokenRange, type); setModifiers(modifiers); setPatternList(patternList); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java index e70d3ffaf1..23e66580cf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -41,17 +40,17 @@ * * @see Name */ -public class SimpleName extends Node implements NodeWithIdentifier { +public class SimpleName extends Node implements NodeWithIdentifier { @NonEmptyProperty private String identifier; - public SimpleName() { + public SimpleName() { this(null, "empty"); } @AllFieldsConstructor - public SimpleName(final String identifier) { + public SimpleName(final String identifier) { this(null, identifier); } @@ -59,7 +58,7 @@ public SimpleName(final String identifier) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SimpleName(TokenRange tokenRange, String identifier) { + public SimpleName(TokenRange tokenRange, String identifier) { super(tokenRange); setIdentifier(identifier); customInitialization(); @@ -67,23 +66,23 @@ public SimpleName(TokenRange tokenRange, String identifier) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public String getIdentifier() { + public String getIdentifier() { return identifier; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName setIdentifier(final String identifier) { + public SimpleName setIdentifier(final String identifier) { assertNonEmpty(identifier); if (identifier == this.identifier) { return this; @@ -93,19 +92,19 @@ public SimpleName setIdentifier(final String identifier) { return this; } - public String asString() { + public String asString() { return identifier; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SimpleName clone() { + public SimpleName clone() { return (SimpleName) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SimpleNameMetaModel getMetaModel() { + public SimpleNameMetaModel getMetaModel() { return JavaParserMetaModel.simpleNameMetaModel; } } 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 117d7f8ba8..99fdbef8ff 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 @@ -30,10 +30,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.SingleMemberAnnotationExprMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -41,16 +39,16 @@ * * @author Julio Vilmar Gesser */ -public class SingleMemberAnnotationExpr extends AnnotationExpr { +public class SingleMemberAnnotationExpr extends AnnotationExpr { private Expression memberValue; - public SingleMemberAnnotationExpr() { + public SingleMemberAnnotationExpr() { this(null, new Name(), new StringLiteralExpr()); } @AllFieldsConstructor - public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) { + public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) { this(null, name, memberValue); } @@ -58,7 +56,7 @@ public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SingleMemberAnnotationExpr(TokenRange tokenRange, Name name, Expression memberValue) { + public SingleMemberAnnotationExpr(TokenRange tokenRange, Name name, Expression memberValue) { super(tokenRange, name); setMemberValue(memberValue); customInitialization(); @@ -66,29 +64,30 @@ public SingleMemberAnnotationExpr(TokenRange tokenRange, Name name, Expression m @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getMemberValue() { + public Expression getMemberValue() { return memberValue; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) { + public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) { assertNotNull(memberValue); if (memberValue == this.memberValue) { return this; } notifyPropertyChange(ObservableProperty.MEMBER_VALUE, this.memberValue, memberValue); - if (this.memberValue != null) this.memberValue.setParentNode(null); + if (this.memberValue != null) + this.memberValue.setParentNode(null); this.memberValue = memberValue; setAsParentNodeOf(memberValue); return this; @@ -96,19 +95,19 @@ public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SingleMemberAnnotationExpr clone() { + public SingleMemberAnnotationExpr clone() { return (SingleMemberAnnotationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SingleMemberAnnotationExprMetaModel getMetaModel() { + public SingleMemberAnnotationExprMetaModel getMetaModel() { return JavaParserMetaModel.singleMemberAnnotationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -121,25 +120,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSingleMemberAnnotationExpr() { + public boolean isSingleMemberAnnotationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SingleMemberAnnotationExpr asSingleMemberAnnotationExpr() { + public SingleMemberAnnotationExpr asSingleMemberAnnotationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSingleMemberAnnotationExpr(Consumer action) { + public void ifSingleMemberAnnotationExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSingleMemberAnnotationExpr() { + public Optional toSingleMemberAnnotationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java index cbb4490df8..9f02f7dac0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java @@ -29,12 +29,11 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.StringLiteralExprMetaModel; import com.github.javaparser.utils.Utils; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.StringEscapeUtils.escapeJava; import static com.github.javaparser.utils.StringEscapeUtils.unescapeJava; +import com.github.javaparser.ast.Node; /** * A literal string. @@ -46,9 +45,9 @@ * * @author Julio Vilmar Gesser */ -public class StringLiteralExpr extends LiteralStringValueExpr { +public class StringLiteralExpr extends LiteralStringValueExpr { - public StringLiteralExpr() { + public StringLiteralExpr() { this(null, "empty"); } @@ -58,7 +57,7 @@ public StringLiteralExpr() { * @param value the value of the literal */ @AllFieldsConstructor - public StringLiteralExpr(final String value) { + public StringLiteralExpr(final String value) { this(null, Utils.escapeEndOfLines(value)); } @@ -66,20 +65,20 @@ public StringLiteralExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public StringLiteralExpr(TokenRange tokenRange, String value) { + public StringLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -89,7 +88,7 @@ public void accept(final VoidVisitor v, final A arg) { * @param value the new literal value * @return self */ - public StringLiteralExpr setEscapedValue(String value) { + public StringLiteralExpr setEscapedValue(String value) { this.value = Utils.escapeEndOfLines(value); return this; } @@ -97,7 +96,7 @@ public StringLiteralExpr setEscapedValue(String value) { /** * @return the unescaped literal value */ - public String asString() { + public String asString() { return unescapeJava(value); } @@ -107,44 +106,44 @@ public String asString() { * @param value unescaped string * @return this literal expression */ - public StringLiteralExpr setString(String value) { + public StringLiteralExpr setString(String value) { this.value = escapeJava(value); return this; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public StringLiteralExpr clone() { + public StringLiteralExpr clone() { return (StringLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public StringLiteralExprMetaModel getMetaModel() { + public StringLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.stringLiteralExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isStringLiteralExpr() { + public boolean isStringLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public StringLiteralExpr asStringLiteralExpr() { + public StringLiteralExpr asStringLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifStringLiteralExpr(Consumer action) { + public void ifStringLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toStringLiteralExpr() { + public Optional toStringLiteralExpr() { return Optional.of(this); } } 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 72b813a663..270a8140d1 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 @@ -45,17 +45,17 @@ * @see com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt * @see ThisExpr */ -public class SuperExpr extends Expression { +public class SuperExpr extends Expression { @OptionalProperty private Name typeName; - public SuperExpr() { + public SuperExpr() { this(null, null); } @AllFieldsConstructor - public SuperExpr(final Name typeName) { + public SuperExpr(final Name typeName) { this(null, typeName); } @@ -63,7 +63,7 @@ public SuperExpr(final Name typeName) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SuperExpr(TokenRange tokenRange, Name typeName) { + public SuperExpr(TokenRange tokenRange, Name typeName) { super(tokenRange); setTypeName(typeName); customInitialization(); @@ -71,28 +71,29 @@ public SuperExpr(TokenRange tokenRange, Name typeName) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getTypeName() { + public Optional getTypeName() { return Optional.ofNullable(typeName); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SuperExpr setTypeName(final Name typeName) { + public SuperExpr setTypeName(final Name typeName) { if (typeName == this.typeName) { return this; } notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName); - if (this.typeName != null) this.typeName.setParentNode(null); + if (this.typeName != null) + this.typeName.setParentNode(null); this.typeName = typeName; setAsParentNodeOf(typeName); return this; @@ -100,7 +101,7 @@ public SuperExpr setTypeName(final Name typeName) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -115,48 +116,48 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SuperExpr clone() { + public SuperExpr clone() { return (SuperExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SuperExprMetaModel getMetaModel() { + public SuperExprMetaModel getMetaModel() { return JavaParserMetaModel.superExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSuperExpr() { + public boolean isSuperExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SuperExpr asSuperExpr() { + public SuperExpr asSuperExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSuperExpr(Consumer action) { + public void ifSuperExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSuperExpr() { + public Optional toSuperExpr() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public SuperExpr removeClassName() { + public SuperExpr removeClassName() { return setTypeName(null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -170,7 +171,7 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public SuperExpr removeTypeName() { + public SuperExpr removeTypeName() { return setTypeName((Name) null); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java index d06353bde5..7cfbde3fcd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.SwitchExprMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -59,18 +57,18 @@ * @see com.github.javaparser.ast.stmt.BreakStmt * @see com.github.javaparser.ast.stmt.YieldStmt */ -public class SwitchExpr extends Expression implements SwitchNode { +public class SwitchExpr extends Expression implements SwitchNode { private Expression selector; private NodeList entries; - public SwitchExpr() { + public SwitchExpr() { this(null, new NameExpr(), new NodeList<>()); } @AllFieldsConstructor - public SwitchExpr(final Expression selector, final NodeList entries) { + public SwitchExpr(final Expression selector, final NodeList entries) { this(null, selector, entries); } @@ -78,7 +76,7 @@ public SwitchExpr(final Expression selector, final NodeList entries * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SwitchExpr(TokenRange tokenRange, Expression selector, NodeList entries) { + public SwitchExpr(TokenRange tokenRange, Expression selector, NodeList entries) { super(tokenRange); setSelector(selector); setEntries(entries); @@ -87,51 +85,53 @@ public SwitchExpr(TokenRange tokenRange, Expression selector, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getEntries() { + public NodeList getEntries() { return entries; } - public SwitchEntry getEntry(int i) { + public SwitchEntry getEntry(int i) { return getEntries().get(i); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getSelector() { + public Expression getSelector() { return selector; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchExpr setEntries(final NodeList entries) { + public SwitchExpr setEntries(final NodeList entries) { assertNotNull(entries); if (entries == this.entries) { return this; } notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries); - if (this.entries != null) this.entries.setParentNode(null); + if (this.entries != null) + this.entries.setParentNode(null); this.entries = entries; setAsParentNodeOf(entries); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchExpr setSelector(final Expression selector) { + public SwitchExpr setSelector(final Expression selector) { assertNotNull(selector); if (selector == this.selector) { return this; } notifyPropertyChange(ObservableProperty.SELECTOR, this.selector, selector); - if (this.selector != null) this.selector.setParentNode(null); + if (this.selector != null) + this.selector.setParentNode(null); this.selector = selector; setAsParentNodeOf(selector); return this; @@ -139,7 +139,7 @@ public SwitchExpr setSelector(final Expression selector) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -154,13 +154,13 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SwitchExpr clone() { + public SwitchExpr clone() { return (SwitchExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -179,31 +179,31 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSwitchExpr() { + public boolean isSwitchExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SwitchExpr asSwitchExpr() { + public SwitchExpr asSwitchExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSwitchExpr() { + public Optional toSwitchExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSwitchExpr(Consumer action) { + public void ifSwitchExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SwitchExprMetaModel getMetaModel() { + public SwitchExprMetaModel getMetaModel() { return JavaParserMetaModel.switchExprMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java index e06678cf6e..70a863662c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java @@ -29,15 +29,14 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.TextBlockLiteralExprMetaModel; import com.github.javaparser.utils.Pair; - import java.util.Arrays; import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Stream; - import static com.github.javaparser.utils.StringEscapeUtils.unescapeJavaTextBlock; import static java.util.stream.Collectors.joining; import static java.util.stream.IntStream.range; +import com.github.javaparser.ast.Node; /** *

A text block

@@ -45,9 +44,9 @@ * A text block is a multi-line string. It was introduced in JEP 355. * The content of "value" is byte-for-byte exactly what is in the source code. */ -public class TextBlockLiteralExpr extends LiteralStringValueExpr { +public class TextBlockLiteralExpr extends LiteralStringValueExpr { - public TextBlockLiteralExpr() { + public TextBlockLiteralExpr() { this(null, "empty"); } @@ -57,7 +56,7 @@ public TextBlockLiteralExpr() { * @param value the value of the literal */ @AllFieldsConstructor - public TextBlockLiteralExpr(final String value) { + public TextBlockLiteralExpr(final String value) { this(null, value); } @@ -65,56 +64,56 @@ public TextBlockLiteralExpr(final String value) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TextBlockLiteralExpr(TokenRange tokenRange, String value) { + public TextBlockLiteralExpr(TokenRange tokenRange, String value) { super(tokenRange, value); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTextBlockLiteralExpr() { + public boolean isTextBlockLiteralExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TextBlockLiteralExpr asTextBlockLiteralExpr() { + public TextBlockLiteralExpr asTextBlockLiteralExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTextBlockLiteralExpr() { + public Optional toTextBlockLiteralExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTextBlockLiteralExpr(Consumer action) { + public void ifTextBlockLiteralExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TextBlockLiteralExpr clone() { + public TextBlockLiteralExpr clone() { return (TextBlockLiteralExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TextBlockLiteralExprMetaModel getMetaModel() { + public TextBlockLiteralExprMetaModel getMetaModel() { return JavaParserMetaModel.textBlockLiteralExprMetaModel; } @@ -122,7 +121,7 @@ public TextBlockLiteralExprMetaModel getMetaModel() { * Most of the algorithm for stripIndent, stopping just before concatenating all the lines into a single string. * Useful for tools. */ - public Stream stripIndentOfLines() { + public Stream stripIndentOfLines() { /* Split the content of the text block at every LF, producing a list of individual lines. Note that any line in the content which was just an LF will become an empty line in the list of individual lines. */ String[] rawLines = getValue().split("\\R", -1); @@ -132,24 +131,17 @@ public Stream stripIndentOfLines() { /* If the last line in the list of individual lines (i.e., the line with the closing delimiter) is blank, then add it to the set of determining lines. (The indentation of the closing delimiter should influence the indentation of the content as a whole -- a "significant trailing line" policy.) */ /* Compute the common white space prefix of the set of determining lines, by counting the number of leading white space characters on each line and taking the minimum count. */ - int commonWhiteSpacePrefixSize = range(0, rawLines.length) - .mapToObj(nr -> new Pair<>(nr, rawLines[nr])) - .filter(l -> !emptyOrWhitespace(l.b) || isLastLine(rawLines, l.a)) - .map(l -> indentSize(l.b)) - .min(Integer::compare) - .orElse(0); + int commonWhiteSpacePrefixSize = range(0, rawLines.length).mapToObj(nr -> new Pair<>(nr, rawLines[nr])).filter(l -> !emptyOrWhitespace(l.b) || isLastLine(rawLines, l.a)).map(l -> indentSize(l.b)).min(Integer::compare).orElse(0); /* Remove the common white space prefix from each non-blank line in the list of individual lines. */ /* Remove all trailing white space from all lines in the modified list of individual lines from step 5. This step collapses wholly-whitespace lines in the modified list so that they are empty, but does not discard them. */ - return Arrays.stream(rawLines) - .map(l -> l.length() < commonWhiteSpacePrefixSize ? l : l.substring(commonWhiteSpacePrefixSize)) - .map(this::trimTrailing); + return Arrays.stream(rawLines).map(l -> l.length() < commonWhiteSpacePrefixSize ? l : l.substring(commonWhiteSpacePrefixSize)).map(this::trimTrailing); } /** * @return The algorithm from String::stripIndent in JDK 13. */ - public String stripIndent() { + public String stripIndent() { /* Construct the result string by joining all the lines in the modified list of individual lines from step 6, using LF as the separator between lines. If the final line in the list from step 6 is empty, then the joining LF from the previous line will be the last character in the result string. */ return stripIndentOfLines().collect(joining("\n")); @@ -158,14 +150,14 @@ public String stripIndent() { /** * @return The algorithm from String::translateEscapes in JDK 13. */ - public String translateEscapes() { + public String translateEscapes() { return unescapeJavaTextBlock(stripIndent()); } /** * @return the final string value of this text block after all processing. */ - public String asString() { + public String asString() { return translateEscapes(); } 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 150e71a937..c4720a3c24 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 @@ -47,17 +47,17 @@ * @see com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt * @see SuperExpr */ -public class ThisExpr extends Expression implements Resolvable { +public class ThisExpr extends Expression implements Resolvable { @OptionalProperty private Name typeName; - public ThisExpr() { + public ThisExpr() { this(null, null); } @AllFieldsConstructor - public ThisExpr(final Name typeName) { + public ThisExpr(final Name typeName) { this(null, typeName); } @@ -65,7 +65,7 @@ public ThisExpr(final Name typeName) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ThisExpr(TokenRange tokenRange, Name typeName) { + public ThisExpr(TokenRange tokenRange, Name typeName) { super(tokenRange); setTypeName(typeName); customInitialization(); @@ -73,28 +73,29 @@ public ThisExpr(TokenRange tokenRange, Name typeName) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getTypeName() { + public Optional getTypeName() { return Optional.ofNullable(typeName); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ThisExpr setTypeName(final Name typeName) { + public ThisExpr setTypeName(final Name typeName) { if (typeName == this.typeName) { return this; } notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName); - if (this.typeName != null) this.typeName.setParentNode(null); + if (this.typeName != null) + this.typeName.setParentNode(null); this.typeName = typeName; setAsParentNodeOf(typeName); return this; @@ -102,7 +103,7 @@ public ThisExpr setTypeName(final Name typeName) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -116,25 +117,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ThisExpr removeClassName() { + public ThisExpr removeClassName() { return setTypeName(null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ThisExpr clone() { + public ThisExpr clone() { return (ThisExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ThisExprMetaModel getMetaModel() { + public ThisExprMetaModel getMetaModel() { return JavaParserMetaModel.thisExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -149,35 +150,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isThisExpr() { + public boolean isThisExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ThisExpr asThisExpr() { + public ThisExpr asThisExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifThisExpr(Consumer action) { + public void ifThisExpr(Consumer action) { action.accept(this); } @Override - public ResolvedTypeDeclaration resolve() { + public ResolvedTypeDeclaration resolve() { return getSymbolResolver().resolveDeclaration(this, ResolvedTypeDeclaration.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toThisExpr() { + public Optional toThisExpr() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ThisExpr removeTypeName() { + public ThisExpr removeTypeName() { return setTypeName((Name) null); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java index e979cb3293..cfd2d11604 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.TypeExprMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -46,16 +44,16 @@ * * @author Raquel Pau */ -public class TypeExpr extends Expression implements NodeWithType { +public class TypeExpr extends Expression implements NodeWithType { private Type type; - public TypeExpr() { + public TypeExpr() { this(null, new ClassOrInterfaceType()); } @AllFieldsConstructor - public TypeExpr(Type type) { + public TypeExpr(Type type) { this(null, type); } @@ -63,7 +61,7 @@ public TypeExpr(Type type) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TypeExpr(TokenRange tokenRange, Type type) { + public TypeExpr(TokenRange tokenRange, Type type) { super(tokenRange); setType(type); customInitialization(); @@ -71,29 +69,30 @@ public TypeExpr(TokenRange tokenRange, Type type) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TypeExpr setType(final Type type) { + public TypeExpr setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; } notifyPropertyChange(ObservableProperty.TYPE, this.type, type); - if (this.type != null) this.type.setParentNode(null); + if (this.type != null) + this.type.setParentNode(null); this.type = type; setAsParentNodeOf(type); return this; @@ -101,19 +100,19 @@ public TypeExpr setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TypeExpr clone() { + public TypeExpr clone() { return (TypeExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TypeExprMetaModel getMetaModel() { + public TypeExprMetaModel getMetaModel() { return JavaParserMetaModel.typeExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -126,25 +125,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeExpr() { + public boolean isTypeExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeExpr asTypeExpr() { + public TypeExpr asTypeExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeExpr(Consumer action) { + public void ifTypeExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeExpr() { + public Optional toTypeExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java index af0c03b0a4..ca93d23c7f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.expr; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName; @@ -71,19 +70,18 @@ * @see JEP305: https://bugs.openjdk.java.net/browse/JDK-8181287 * @see https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20 */ -public class TypePatternExpr extends PatternExpr - implements NodeWithSimpleName, NodeWithFinalModifier { +public class TypePatternExpr extends PatternExpr implements NodeWithSimpleName, NodeWithFinalModifier { private NodeList modifiers; private SimpleName name; - public TypePatternExpr() { + public TypePatternExpr() { this(null, new NodeList<>(), new ClassOrInterfaceType(), new SimpleName()); } @AllFieldsConstructor - public TypePatternExpr(final NodeList modifiers, final Type type, SimpleName name) { + public TypePatternExpr(final NodeList modifiers, final Type type, SimpleName name) { this(null, modifiers, type, name); } @@ -91,7 +89,7 @@ public TypePatternExpr(final NodeList modifiers, final Type type, Simp * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TypePatternExpr(TokenRange tokenRange, NodeList modifiers, Type type, SimpleName name) { + public TypePatternExpr(TokenRange tokenRange, NodeList modifiers, Type type, SimpleName name) { super(tokenRange, type); setModifiers(modifiers); setName(name); @@ -100,29 +98,30 @@ public TypePatternExpr(TokenRange tokenRange, NodeList modifiers, Type @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TypePatternExpr setName(final SimpleName name) { + public TypePatternExpr setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -130,7 +129,7 @@ public TypePatternExpr setName(final SimpleName name) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -149,29 +148,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TypePatternExpr clone() { + public TypePatternExpr clone() { return (TypePatternExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TypePatternExprMetaModel getMetaModel() { + public TypePatternExprMetaModel getMetaModel() { return JavaParserMetaModel.typePatternExprMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TypePatternExpr setModifiers(final NodeList modifiers) { + public TypePatternExpr setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; @@ -179,7 +179,7 @@ public TypePatternExpr setModifiers(final NodeList modifiers) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -194,25 +194,25 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypePatternExpr() { + public boolean isTypePatternExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypePatternExpr asTypePatternExpr() { + public TypePatternExpr asTypePatternExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypePatternExpr() { + public Optional toTypePatternExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypePatternExpr(Consumer action) { + public void ifTypePatternExpr(Consumer action) { action.accept(this); } } 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 9d1d18e277..cd17e4abf2 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 @@ -33,10 +33,8 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.UnaryExprMetaModel; import com.github.javaparser.printer.Stringable; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -49,9 +47,10 @@ * * @author Julio Vilmar Gesser */ -public class UnaryExpr extends Expression implements NodeWithExpression { +public class UnaryExpr extends Expression implements NodeWithExpression { + + public enum Operator implements Stringable { - public enum Operator implements Stringable { PLUS("+", false), MINUS("-", false), PREFIX_INCREMENT("++", false), @@ -70,15 +69,15 @@ public enum Operator implements Stringable { this.isPostfix = isPostfix; } - public String asString() { + public String asString() { return codeRepresentation; } - public boolean isPostfix() { + public boolean isPostfix() { return isPostfix; } - public boolean isPrefix() { + public boolean isPrefix() { return !isPostfix(); } } @@ -87,12 +86,12 @@ public boolean isPrefix() { private Operator operator; - public UnaryExpr() { + public UnaryExpr() { this(null, new IntegerLiteralExpr(), Operator.POSTFIX_INCREMENT); } @AllFieldsConstructor - public UnaryExpr(final Expression expression, final Operator operator) { + public UnaryExpr(final Expression expression, final Operator operator) { this(null, expression, operator); } @@ -100,7 +99,7 @@ public UnaryExpr(final Expression expression, final Operator operator) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public UnaryExpr(TokenRange tokenRange, Expression expression, Operator operator) { + public UnaryExpr(TokenRange tokenRange, Expression expression, Operator operator) { super(tokenRange); setExpression(expression); setOperator(operator); @@ -109,41 +108,42 @@ public UnaryExpr(TokenRange tokenRange, Expression expression, Operator operator @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Operator getOperator() { + public Operator getOperator() { return operator; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public UnaryExpr setExpression(final Expression expression) { + public UnaryExpr setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public UnaryExpr setOperator(final Operator operator) { + public UnaryExpr setOperator(final Operator operator) { assertNotNull(operator); if (operator == this.operator) { return this; @@ -154,30 +154,30 @@ public UnaryExpr setOperator(final Operator operator) { } @DerivedProperty - public boolean isPostfix() { + public boolean isPostfix() { return operator.isPostfix(); } @DerivedProperty - public boolean isPrefix() { + public boolean isPrefix() { return !isPostfix(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public UnaryExpr clone() { + public UnaryExpr clone() { return (UnaryExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public UnaryExprMetaModel getMetaModel() { + public UnaryExprMetaModel getMetaModel() { return JavaParserMetaModel.unaryExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -190,25 +190,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnaryExpr() { + public boolean isUnaryExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnaryExpr asUnaryExpr() { + public UnaryExpr asUnaryExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnaryExpr(Consumer action) { + public void ifUnaryExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnaryExpr() { + public Optional toUnaryExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java index fa3215eacc..5d811645aa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java @@ -34,12 +34,10 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.NonEmptyProperty; import com.github.javaparser.metamodel.VariableDeclarationExprMetaModel; - import java.util.Arrays; import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; - import static com.github.javaparser.ast.NodeList.nodeList; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -54,10 +52,7 @@ * * @author Julio Vilmar Gesser */ -public class VariableDeclarationExpr extends Expression - implements NodeWithFinalModifier, - NodeWithAnnotations, - NodeWithVariables { +public class VariableDeclarationExpr extends Expression implements NodeWithFinalModifier, NodeWithAnnotations, NodeWithVariables { private NodeList modifiers; @@ -66,47 +61,36 @@ public class VariableDeclarationExpr extends Expression @NonEmptyProperty private NodeList variables; - public VariableDeclarationExpr() { + public VariableDeclarationExpr() { this(null, new NodeList<>(), new NodeList<>(), new NodeList<>()); } - public VariableDeclarationExpr(final Type type, String variableName) { + public VariableDeclarationExpr(final Type type, String variableName) { this(null, new NodeList<>(), new NodeList<>(), nodeList(new VariableDeclarator(type, variableName))); } - public VariableDeclarationExpr(VariableDeclarator var) { + public VariableDeclarationExpr(VariableDeclarator var) { this(null, new NodeList<>(), new NodeList<>(), nodeList(var)); } - public VariableDeclarationExpr(final Type type, String variableName, Modifier... modifiers) { - this( - null, - Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), - new NodeList<>(), - nodeList(new VariableDeclarator(type, variableName))); + public VariableDeclarationExpr(final Type type, String variableName, Modifier... modifiers) { + this(null, Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), new NodeList<>(), nodeList(new VariableDeclarator(type, variableName))); } - public VariableDeclarationExpr(VariableDeclarator var, Modifier... modifiers) { - this( - null, - Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), - new NodeList<>(), - nodeList(var)); + public VariableDeclarationExpr(VariableDeclarator var, Modifier... modifiers) { + this(null, Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), new NodeList<>(), nodeList(var)); } - public VariableDeclarationExpr(final NodeList variables) { + public VariableDeclarationExpr(final NodeList variables) { this(null, new NodeList<>(), new NodeList<>(), variables); } - public VariableDeclarationExpr(final NodeList modifiers, final NodeList variables) { + public VariableDeclarationExpr(final NodeList modifiers, final NodeList variables) { this(null, modifiers, new NodeList<>(), variables); } @AllFieldsConstructor - public VariableDeclarationExpr( - final NodeList modifiers, - final NodeList annotations, - final NodeList variables) { + public VariableDeclarationExpr(final NodeList modifiers, final NodeList annotations, final NodeList variables) { this(null, modifiers, annotations, variables); } @@ -114,11 +98,7 @@ public VariableDeclarationExpr( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public VariableDeclarationExpr( - TokenRange tokenRange, - NodeList modifiers, - NodeList annotations, - NodeList variables) { + public VariableDeclarationExpr(TokenRange tokenRange, NodeList modifiers, NodeList annotations, NodeList variables) { super(tokenRange); setModifiers(modifiers); setAnnotations(annotations); @@ -128,18 +108,18 @@ public VariableDeclarationExpr( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @@ -150,49 +130,52 @@ public NodeList getAnnotations() { * @see Modifier */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getVariables() { + public NodeList getVariables() { return variables; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr setAnnotations(final NodeList annotations) { + public VariableDeclarationExpr setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr setModifiers(final NodeList modifiers) { + public VariableDeclarationExpr setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr setVariables(final NodeList variables) { + public VariableDeclarationExpr setVariables(final NodeList variables) { assertNotNull(variables); if (variables == this.variables) { return this; } notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables); - if (this.variables != null) this.variables.setParentNode(null); + if (this.variables != null) + this.variables.setParentNode(null); this.variables = variables; setAsParentNodeOf(variables); return this; @@ -200,7 +183,7 @@ public VariableDeclarationExpr setVariables(final NodeList v @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -227,19 +210,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public VariableDeclarationExpr clone() { + public VariableDeclarationExpr clone() { return (VariableDeclarationExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public VariableDeclarationExprMetaModel getMetaModel() { + public VariableDeclarationExprMetaModel getMetaModel() { return JavaParserMetaModel.variableDeclarationExprMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -266,25 +249,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVariableDeclarationExpr() { + public boolean isVariableDeclarationExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VariableDeclarationExpr asVariableDeclarationExpr() { + public VariableDeclarationExpr asVariableDeclarationExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVariableDeclarationExpr(Consumer action) { + public void ifVariableDeclarationExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVariableDeclarationExpr() { + public Optional toVariableDeclarationExpr() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java index 9451af007e..62362b0640 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java @@ -11,33 +11,33 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class ArbitraryNodeContainer extends Node { +public class ArbitraryNodeContainer extends Node { private NodeList children; - public ArbitraryNodeContainer() { + public ArbitraryNodeContainer() { this(new NodeList<>()); } - public ArbitraryNodeContainer(NodeList children) { + public ArbitraryNodeContainer(NodeList children) { super(null); this.children = children; } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { return null; } @Override - public void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { } - public NodeList getChildren() { + public NodeList getChildren() { return children; } - public void setChildren(NodeList children) { + public void setChildren(NodeList children) { this.children = children; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/DefaultJmlContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/DefaultJmlContainer.java index a0b0ae2bb6..bb16bc31d1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/DefaultJmlContainer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/DefaultJmlContainer.java @@ -8,35 +8,35 @@ * @author Alexander Weigl * @version 1 (3/21/21) */ -public class DefaultJmlContainer implements JmlContainer { +public class DefaultJmlContainer implements JmlContainer { @Override - public NodeList getElements() { + public NodeList getElements() { return null; } @Override - public Node setElements(NodeList elements) { + public Node setElements(NodeList elements) { return null; } @Override - public NodeList getJmlTags() { + public NodeList getJmlTags() { return null; } @Override - public boolean isSingleLine() { + public boolean isSingleLine() { return false; } @Override - public Node setSingleLine(boolean singleLine) { + public Node setSingleLine(boolean singleLine) { return null; } @Override - public Node setJmlTags(NodeList jmlTags) { + public Node setJmlTags(NodeList jmlTags) { return null; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/HasJmlTags.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/HasJmlTags.java index 6a498bdac7..1da674e16a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/HasJmlTags.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/HasJmlTags.java @@ -8,7 +8,7 @@ * @author Alexander Weigl * @version 1 (9/8/21) */ -public interface HasJmlTags { +public interface HasJmlTags { N setJmlTags(NodeList jmlTags); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java index 28b9e8a48e..fd600bcd77 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java @@ -14,7 +14,7 @@ * @version 1 (3/21/21) */ @Deprecated -public interface JmlContainer extends Jmlish { +public interface JmlContainer extends Jmlish { NodeList getElements(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlKeyword.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlKeyword.java index db9b1559dc..9faebb6eb9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlKeyword.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlKeyword.java @@ -6,7 +6,7 @@ * @author Alexander Weigl * @version 1 (3/20/21) */ -public interface JmlKeyword extends Stringable { +public interface JmlKeyword extends Stringable { String jmlSymbol(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java index ec371a545c..ccbe8ee9d2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java @@ -18,7 +18,7 @@ * @author Alexander Weigl * @version 1 (12/14/21) */ -public class JmlModelProgram extends Node implements NodeWithModifiers, NodeWithAnnotations, NodeWithContracts { +public class JmlModelProgram extends Node implements NodeWithModifiers, NodeWithAnnotations, NodeWithContracts { private Modifier modifiers; @@ -29,55 +29,55 @@ public class JmlModelProgram extends Node implements NodeWithModifiers statements; - public JmlModelProgram(TokenRange tokenRange) { + public JmlModelProgram(TokenRange tokenRange) { this(null, new NodeList<>(), new NodeList<>(), null, new NodeList<>()); } @AllFieldsConstructor - public JmlModelProgram(NodeList modifiers, NodeList annotations, JmlContract contracts, NodeList statements) { + public JmlModelProgram(NodeList modifiers, NodeList annotations, JmlContract contracts, NodeList statements) { this(null, modifiers, annotations, contracts, statements); } - public JmlModelProgram(TokenRange range, NodeList modifiers, NodeList annotations, JmlContract contracts, NodeList statements) { + public JmlModelProgram(TokenRange range, NodeList modifiers, NodeList annotations, JmlContract contracts, NodeList statements) { super(range); } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { return null; } @Override - public void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { } @Override - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Override - public JmlModelProgram setContracts(NodeList contracts) { + public JmlModelProgram setContracts(NodeList contracts) { return null; } @Override - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @Override - public JmlModelProgram setAnnotations(NodeList annotations) { + public JmlModelProgram setAnnotations(NodeList annotations) { return null; } @Override - public NodeList getModifiers() { + public NodeList getModifiers() { return null; } @Override - public JmlModelProgram setModifiers(NodeList modifiers) { + public JmlModelProgram setModifiers(NodeList modifiers) { return null; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java index 9f7af7ffd7..503dcf6a6c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java @@ -9,7 +9,7 @@ * @author Alexander Weigl * @version 1 (12/9/21) */ -public interface NodeWithContracts { +public interface NodeWithContracts { NodeList getContracts(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithJmlTags.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithJmlTags.java index 30af9376a7..26ca577098 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithJmlTags.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithJmlTags.java @@ -8,7 +8,7 @@ * @author Alexander Weigl * @version 1 (30.05.22) */ -public interface NodeWithJmlTags { +public interface NodeWithJmlTags { NodeList getJmlTags(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java index 0c7cf61db9..5fe798b52a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java @@ -20,7 +20,7 @@ * @author Alexander Weigl * @version 1 (3/11/21) */ -public class JmlClassAccessibleDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers { +public class JmlClassAccessibleDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers { private NodeList modifiers; @@ -33,12 +33,12 @@ public class JmlClassAccessibleDeclaration extends JmlClassLevelDeclaration jmlTags; - public JmlClassAccessibleDeclaration() { + public JmlClassAccessibleDeclaration() { this(null, new NodeList<>(), new NodeList<>(), null, new NodeList<>(), null); } @AllFieldsConstructor - public JmlClassAccessibleDeclaration(NodeList jmlTags, NodeList modifiers, Expression variable, NodeList expressions, Expression measuredBy) { + public JmlClassAccessibleDeclaration(NodeList jmlTags, NodeList modifiers, Expression variable, NodeList expressions, Expression measuredBy) { this(null, jmlTags, modifiers, variable, expressions, measuredBy); } @@ -46,7 +46,7 @@ public JmlClassAccessibleDeclaration(NodeList jmlTags, NodeList jmlTags, NodeList modifiers, Expression variable, NodeList expressions, Expression measuredBy) { + public JmlClassAccessibleDeclaration(TokenRange tokenRange, NodeList jmlTags, NodeList modifiers, Expression variable, NodeList expressions, Expression measuredBy) { super(tokenRange); setJmlTags(jmlTags); setModifiers(modifiers); @@ -57,12 +57,12 @@ public JmlClassAccessibleDeclaration(TokenRange tokenRange, NodeList } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassAccessibleDeclaration setModifiers(final NodeList modifiers) { + public JmlClassAccessibleDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; @@ -77,13 +77,13 @@ public JmlClassAccessibleDeclaration setModifiers(final NodeList modif @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -91,14 +91,14 @@ public void accept(final VoidVisitor v, final A arg) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClassAccessibleDeclaration(TokenRange tokenRange) { + public JmlClassAccessibleDeclaration(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -131,7 +131,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -168,17 +168,17 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClassAccessibleDeclaration clone() { + public JmlClassAccessibleDeclaration clone() { return (JmlClassAccessibleDeclaration) accept(new CloneVisitor(), null); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getExpressions() { + public NodeList getExpressions() { return expressions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassAccessibleDeclaration setExpressions(final NodeList expressions) { + public JmlClassAccessibleDeclaration setExpressions(final NodeList expressions) { assertNotNull(expressions); if (expressions == this.expressions) { return this; @@ -192,12 +192,12 @@ public JmlClassAccessibleDeclaration setExpressions(final NodeList e } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getVariable() { + public Expression getVariable() { return variable; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassAccessibleDeclaration setVariable(final Expression variable) { + public JmlClassAccessibleDeclaration setVariable(final Expression variable) { assertNotNull(variable); if (variable == this.variable) { return this; @@ -211,12 +211,12 @@ public JmlClassAccessibleDeclaration setVariable(final Expression variable) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getMeasuredBy() { + public Optional getMeasuredBy() { return Optional.ofNullable(measuredBy); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassAccessibleDeclaration setMeasuredBy(final Expression measuredBy) { + public JmlClassAccessibleDeclaration setMeasuredBy(final Expression measuredBy) { if (measuredBy == this.measuredBy) { return this; } @@ -229,48 +229,48 @@ public JmlClassAccessibleDeclaration setMeasuredBy(final Expression measuredBy) } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlClassAccessibleDeclaration removeMeasuredBy() { + public JmlClassAccessibleDeclaration removeMeasuredBy() { return setMeasuredBy((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassAccessibleDeclaration() { + public boolean isJmlClassAccessibleDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassAccessibleDeclaration asJmlClassAccessibleDeclaration() { + public JmlClassAccessibleDeclaration asJmlClassAccessibleDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassAccessibleDeclaration() { + public Optional toJmlClassAccessibleDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassAccessibleDeclaration(Consumer action) { + public void ifJmlClassAccessibleDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClassAccessibleDeclarationMetaModel getMetaModel() { + public JmlClassAccessibleDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlClassAccessibleDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassAccessibleDeclaration setJmlTags(final NodeList jmlTags) { + public JmlClassAccessibleDeclaration setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java index ad386656ed..8fa812b882 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java @@ -21,7 +21,7 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlClassExprDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers { +public class JmlClassExprDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers { private SimpleName kind; @@ -34,38 +34,38 @@ public class JmlClassExprDeclaration extends JmlClassLevelDeclaration jmlTags; - public JmlClassExprDeclaration() { + public JmlClassExprDeclaration() { super(null); } @AllFieldsConstructor - public JmlClassExprDeclaration(NodeList jmlTags, NodeList modifiers, SimpleName kind, SimpleName name, Expression invariant) { + public JmlClassExprDeclaration(NodeList jmlTags, NodeList modifiers, SimpleName kind, SimpleName name, Expression invariant) { this(null, jmlTags, modifiers, kind, name, invariant); } - public JmlClassExprDeclaration(TokenRange range, JavaToken begin, NodeList modifiers, Expression expr) { + public JmlClassExprDeclaration(TokenRange range, JavaToken begin, NodeList modifiers, Expression expr) { this(range, modifiers, new SimpleName(new TokenRange(begin, begin), begin.getText()), expr); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getInvariant() { + public Expression getInvariant() { return invariant; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassExprDeclaration setInvariant(final Expression invariant) { + public JmlClassExprDeclaration setInvariant(final Expression invariant) { assertNotNull(invariant); if (invariant == this.invariant) { return this; @@ -80,7 +80,7 @@ public JmlClassExprDeclaration setInvariant(final Expression invariant) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -107,7 +107,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -142,7 +142,7 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClassExprDeclaration clone() { + public JmlClassExprDeclaration clone() { return (JmlClassExprDeclaration) accept(new CloneVisitor(), null); } @@ -150,7 +150,7 @@ public JmlClassExprDeclaration clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClassExprDeclaration(TokenRange tokenRange, NodeList modifiers, SimpleName kind, Expression invariant) { + public JmlClassExprDeclaration(TokenRange tokenRange, NodeList modifiers, SimpleName kind, Expression invariant) { super(tokenRange); setModifiers(modifiers); setKind(kind); @@ -159,12 +159,12 @@ public JmlClassExprDeclaration(TokenRange tokenRange, NodeList modifie } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassExprDeclaration setModifiers(final NodeList modifiers) { + public JmlClassExprDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; @@ -179,59 +179,59 @@ public JmlClassExprDeclaration setModifiers(final NodeList modifiers) @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassInvariantDeclaration() { + public boolean isJmlClassInvariantDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassExprDeclaration asJmlClassInvariantDeclaration() { + public JmlClassExprDeclaration asJmlClassInvariantDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassInvariantDeclaration() { + public Optional toJmlClassInvariantDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassInvariantDeclaration(Consumer action) { + public void ifJmlClassInvariantDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassExprDeclaration() { + public boolean isJmlClassExprDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassExprDeclaration asJmlClassExprDeclaration() { + public JmlClassExprDeclaration asJmlClassExprDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassExprDeclaration() { + public Optional toJmlClassExprDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassExprDeclaration(Consumer action) { + public void ifJmlClassExprDeclaration(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getKind() { + public SimpleName getKind() { return kind; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassExprDeclaration setKind(final SimpleName kind) { + public JmlClassExprDeclaration setKind(final SimpleName kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -245,23 +245,23 @@ public JmlClassExprDeclaration setKind(final SimpleName kind) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlClassExprDeclaration removeKind() { + public JmlClassExprDeclaration removeKind() { return setKind(null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClassExprDeclarationMetaModel getMetaModel() { + public JmlClassExprDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlClassExprDeclarationMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getName() { + public Optional getName() { return Optional.ofNullable(name); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassExprDeclaration setName(final SimpleName name) { + public JmlClassExprDeclaration setName(final SimpleName name) { if (name == this.name) { return this; } @@ -274,7 +274,7 @@ public JmlClassExprDeclaration setName(final SimpleName name) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlClassExprDeclaration removeName() { + public JmlClassExprDeclaration removeName() { return setName((SimpleName) null); } @@ -282,7 +282,7 @@ public JmlClassExprDeclaration removeName() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClassExprDeclaration(TokenRange tokenRange, NodeList jmlTags, NodeList modifiers, SimpleName kind, SimpleName name, Expression invariant) { + public JmlClassExprDeclaration(TokenRange tokenRange, NodeList jmlTags, NodeList modifiers, SimpleName kind, SimpleName name, Expression invariant) { super(tokenRange); setJmlTags(jmlTags); setModifiers(modifiers); @@ -294,12 +294,12 @@ public JmlClassExprDeclaration(TokenRange tokenRange, NodeList jmlTa @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClassExprDeclaration setJmlTags(final NodeList jmlTags) { + public JmlClassExprDeclaration setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java index 2054039020..47f89e1b3c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java @@ -11,7 +11,6 @@ import com.github.javaparser.metamodel.JmlClassLevelDeclarationMetaModel; import java.util.Optional; import java.util.function.Consumer; - import com.github.javaparser.ast.Node; /** @@ -21,70 +20,75 @@ public abstract class JmlClassLevelDeclaration> extends BodyDeclaration implements Jmlish, NodeWithJmlTags { @AllFieldsConstructor - public JmlClassLevelDeclaration() { + public JmlClassLevelDeclaration() { } /** * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClassLevelDeclaration(TokenRange tokenRange) { + public JmlClassLevelDeclaration(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClassLevelDeclaration clone() { + public JmlClassLevelDeclaration clone() { return (JmlClassLevelDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClassLevel() { + public boolean isJmlClassLevel() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClassLevelDeclaration asJmlClassLevel() { + public JmlClassLevelDeclaration asJmlClassLevel() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClassLevel() { + public Optional toJmlClassLevel() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClassLevel(Consumer action) { + public void ifJmlClassLevel(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClassLevelDeclarationMetaModel getMetaModel() { + public JmlClassLevelDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlClassLevelDeclarationMetaModel; } @Override - public boolean isJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public boolean isJmlClassLevelDeclaration() { return true; } @Override - public JmlClassLevelDeclaration asJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public JmlClassLevelDeclaration asJmlClassLevelDeclaration() { return this; } @Override - public Optional toJmlClassLevelDeclaration() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public Optional toJmlClassLevelDeclaration() { return Optional.of(this); } - public void ifJmlClassLevelDeclaration(Consumer action) { + @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public void ifJmlClassLevelDeclaration(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java index a14aeee90e..1e1da53ece 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java @@ -21,18 +21,18 @@ * @author Alexander Weigl * @version 1 (3/11/21) */ -public class JmlFieldDeclaration extends JmlClassLevelDeclaration { +public class JmlFieldDeclaration extends JmlClassLevelDeclaration { private FieldDeclaration decl; private NodeList jmlTags; - public JmlFieldDeclaration() { + public JmlFieldDeclaration() { this(null, null); } @AllFieldsConstructor - public JmlFieldDeclaration(NodeList jmlTags, FieldDeclaration decl) { + public JmlFieldDeclaration(NodeList jmlTags, FieldDeclaration decl) { this(null, jmlTags, decl); } @@ -40,7 +40,7 @@ public JmlFieldDeclaration(NodeList jmlTags, FieldDeclaration decl) * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlFieldDeclaration(TokenRange tokenRange, NodeList jmlTags, FieldDeclaration decl) { + public JmlFieldDeclaration(TokenRange tokenRange, NodeList jmlTags, FieldDeclaration decl) { super(tokenRange); setJmlTags(jmlTags); setDecl(decl); @@ -49,47 +49,47 @@ public JmlFieldDeclaration(TokenRange tokenRange, NodeList jmlTags, @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlFieldDeclaration() { + public boolean isJmlFieldDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlFieldDeclaration asJmlFieldDeclaration() { + public JmlFieldDeclaration asJmlFieldDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlFieldDeclaration() { + public Optional toJmlFieldDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlFieldDeclaration(Consumer action) { + public void ifJmlFieldDeclaration(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public FieldDeclaration getDecl() { + public FieldDeclaration getDecl() { return decl; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlFieldDeclaration setDecl(final FieldDeclaration decl) { + public JmlFieldDeclaration setDecl(final FieldDeclaration decl) { assertNotNull(decl); if (decl == this.decl) { return this; @@ -104,7 +104,7 @@ public JmlFieldDeclaration setDecl(final FieldDeclaration decl) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -123,24 +123,24 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlFieldDeclaration clone() { + public JmlFieldDeclaration clone() { return (JmlFieldDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlFieldDeclarationMetaModel getMetaModel() { + public JmlFieldDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlFieldDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlFieldDeclaration setJmlTags(final NodeList jmlTags) { + public JmlFieldDeclaration setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -155,7 +155,7 @@ public JmlFieldDeclaration setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java index 0ae2f4a26e..0c071bf16c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java @@ -23,7 +23,7 @@ * @author Alexander Weigl * @version 1 (4/5/21) */ -public class JmlMethodDeclaration extends JmlClassLevelDeclaration { +public class JmlMethodDeclaration extends JmlClassLevelDeclaration { private MethodDeclaration methodDeclaration; @@ -32,12 +32,12 @@ public class JmlMethodDeclaration extends JmlClassLevelDeclaration jmlTags; - public JmlMethodDeclaration() { + public JmlMethodDeclaration() { this(null, new NodeList<>(), new MethodDeclaration(), null); } @AllFieldsConstructor - public JmlMethodDeclaration(NodeList jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) { + public JmlMethodDeclaration(NodeList jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) { this(null, jmlTags, methodDeclaration, contract); } @@ -45,7 +45,7 @@ public JmlMethodDeclaration(NodeList jmlTags, MethodDeclaration meth * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlMethodDeclaration(TokenRange tokenRange, NodeList jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) { + public JmlMethodDeclaration(TokenRange tokenRange, NodeList jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) { super(tokenRange); setJmlTags(jmlTags); setMethodDeclaration(methodDeclaration); @@ -55,23 +55,23 @@ public JmlMethodDeclaration(TokenRange tokenRange, NodeList jmlTags, @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public MethodDeclaration getMethodDeclaration() { + public MethodDeclaration getMethodDeclaration() { return methodDeclaration; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodDeclaration setMethodDeclaration(final MethodDeclaration methodDeclaration) { + public JmlMethodDeclaration setMethodDeclaration(final MethodDeclaration methodDeclaration) { assertNotNull(methodDeclaration); if (methodDeclaration == this.methodDeclaration) { return this; @@ -86,7 +86,7 @@ public JmlMethodDeclaration setMethodDeclaration(final MethodDeclaration methodD @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -107,7 +107,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -132,17 +132,17 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlMethodDeclaration clone() { + public JmlMethodDeclaration clone() { return (JmlMethodDeclaration) accept(new CloneVisitor(), null); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getContract() { + public Optional getContract() { return Optional.ofNullable(contract); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodDeclaration setContract(final JmlContract contract) { + public JmlMethodDeclaration setContract(final JmlContract contract) { if (contract == this.contract) { return this; } @@ -155,48 +155,48 @@ public JmlMethodDeclaration setContract(final JmlContract contract) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlMethodDeclaration removeContract() { + public JmlMethodDeclaration removeContract() { return setContract((JmlContract) null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMethodDeclaration() { + public boolean isJmlMethodDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMethodDeclaration asJmlMethodDeclaration() { + public JmlMethodDeclaration asJmlMethodDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMethodDeclaration() { + public Optional toJmlMethodDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMethodDeclaration(Consumer action) { + public void ifJmlMethodDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlMethodDeclarationMetaModel getMetaModel() { + public JmlMethodDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlMethodDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodDeclaration setJmlTags(final NodeList jmlTags) { + public JmlMethodDeclaration setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java index 8729e8fbe7..4da531c260 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java @@ -26,7 +26,7 @@ * @author Alexander Weigl * @version 1 (3/11/21) */ -public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers, NodeWithName { +public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration implements NodeWithModifiers, NodeWithName { private NodeList modifiers; @@ -37,7 +37,7 @@ public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration jmlTags; @AllFieldsConstructor - public JmlRepresentsDeclaration(NodeList jmlTags, NodeList modifiers, Name name, Expression expr) { + public JmlRepresentsDeclaration(NodeList jmlTags, NodeList modifiers, Name name, Expression expr) { this(null, jmlTags, modifiers, name, expr); } @@ -45,7 +45,7 @@ public JmlRepresentsDeclaration(NodeList jmlTags, NodeList * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlRepresentsDeclaration(TokenRange tokenRange, NodeList jmlTags, NodeList modifiers, Name name, Expression expr) { + public JmlRepresentsDeclaration(TokenRange tokenRange, NodeList jmlTags, NodeList modifiers, Name name, Expression expr) { super(tokenRange); setJmlTags(jmlTags); setModifiers(modifiers); @@ -55,12 +55,12 @@ public JmlRepresentsDeclaration(TokenRange tokenRange, NodeList jmlT } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlRepresentsDeclaration setModifiers(final NodeList modifiers) { + public JmlRepresentsDeclaration setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; @@ -75,23 +75,23 @@ public JmlRepresentsDeclaration setModifiers(final NodeList modifiers) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpr() { + public Expression getExpr() { return expr; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlRepresentsDeclaration setExpr(final Expression expr) { + public JmlRepresentsDeclaration setExpr(final Expression expr) { assertNotNull(expr); if (expr == this.expr) { return this; @@ -105,12 +105,12 @@ public JmlRepresentsDeclaration setExpr(final Expression expr) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlRepresentsDeclaration setName(final Name name) { + public JmlRepresentsDeclaration setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; @@ -125,7 +125,7 @@ public JmlRepresentsDeclaration setName(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -146,7 +146,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -175,48 +175,48 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlRepresentsDeclaration clone() { + public JmlRepresentsDeclaration clone() { return (JmlRepresentsDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlRepresentsDeclaration() { + public boolean isJmlRepresentsDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlRepresentsDeclaration asJmlRepresentsDeclaration() { + public JmlRepresentsDeclaration asJmlRepresentsDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlRepresentsDeclaration() { + public Optional toJmlRepresentsDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlRepresentsDeclaration(Consumer action) { + public void ifJmlRepresentsDeclaration(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlRepresentsDeclarationMetaModel getMetaModel() { + public JmlRepresentsDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlRepresentsDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlRepresentsDeclaration setJmlTags(final NodeList jmlTags) { + public JmlRepresentsDeclaration setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java index 1aeb947618..d9526674f9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java @@ -8,7 +8,7 @@ * @author Alexander Weigl * @version 1 (3/17/21) */ -public class JmlSpecification { +public class JmlSpecification { /**/ private boolean singleLine; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java index 0d444a17eb..66575a2a78 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (3/16/21) */ -public interface BlockContractable { +public interface BlockContractable { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java index e7281ec122..3e453da911 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java @@ -7,7 +7,7 @@ * @author Alexander Weigl * @version 1 (04.05.24) */ -public enum ContractType { +public enum ContractType { METHOD(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION), LOOP(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, RETURNS, BREAKS, CONTINUES, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION), @@ -22,7 +22,7 @@ public enum ContractType { validKinds = EnumSet.of(first, kinds); } - public boolean isValidClauseKind(JmlClauseKind clauseKind) { + public boolean isValidClauseKind(JmlClauseKind clauseKind) { return validKinds.contains(clauseKind); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java index 581b6e641d..7b1412d6c6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java @@ -20,12 +20,12 @@ * @author Alexander Weigl * @version 1 (2/22/21) */ -public class JmlCallableClause extends JmlClause { +public class JmlCallableClause extends JmlClause { private NodeList methodSignatures = new NodeList(); @AllFieldsConstructor - public JmlCallableClause(SimpleName name, NodeList methodSignatures) { + public JmlCallableClause(SimpleName name, NodeList methodSignatures) { super(name); } @@ -33,71 +33,71 @@ public JmlCallableClause(SimpleName name, NodeList methodSig * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlCallableClause(TokenRange tokenRange) { + public JmlCallableClause(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlCallableClause clone() { + public JmlCallableClause clone() { return (JmlCallableClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlCallableClauseMetaModel getMetaModel() { + public JmlCallableClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlCallableClauseMetaModel; } @Override - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return JmlClauseKind.CALLABLE; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlCallableClause() { + public boolean isJmlCallableClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlCallableClause asJmlCallableClause() { + public JmlCallableClause asJmlCallableClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlCallableClause() { + public Optional toJmlCallableClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlCallableClause(Consumer action) { + public void ifJmlCallableClause(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getMethodSignatures() { + public NodeList getMethodSignatures() { return methodSignatures; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlCallableClause setMethodSignatures(final NodeList methodSignatures) { + public JmlCallableClause setMethodSignatures(final NodeList methodSignatures) { assertNotNull(methodSignatures); if (methodSignatures == this.methodSignatures) { return this; @@ -112,7 +112,7 @@ public JmlCallableClause setMethodSignatures(final NodeList @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -127,7 +127,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -144,7 +144,7 @@ public boolean replace(Node node, Node replacementNode) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlCallableClause(TokenRange tokenRange, SimpleName name, NodeList methodSignatures) { + public JmlCallableClause(TokenRange tokenRange, SimpleName name, NodeList methodSignatures) { super(tokenRange, name); setMethodSignatures(methodSignatures); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java index 49a29d7010..005541e6f9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java @@ -24,12 +24,12 @@ public abstract class JmlClause extends Node implements Jmlish { @OptionalProperty private SimpleName name; - public JmlClause() { + public JmlClause() { this((SimpleName) null); } @AllFieldsConstructor - public JmlClause(final SimpleName name) { + public JmlClause(final SimpleName name) { this(null, name); } @@ -37,7 +37,7 @@ public JmlClause(final SimpleName name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClause(TokenRange tokenRange, SimpleName name) { + public JmlClause(TokenRange tokenRange, SimpleName name) { super(tokenRange); setName(name); customInitialization(); @@ -47,32 +47,32 @@ public JmlClause(TokenRange tokenRange, SimpleName name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClause(TokenRange tokenRange) { + public JmlClause(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClause clone() { + public JmlClause clone() { return (JmlClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClauseMetaModel getMetaModel() { + public JmlClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlClauseMetaModel; } public abstract JmlClauseKind getKind(); @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getName() { + public Optional getName() { return Optional.ofNullable(name); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClause setName(final SimpleName name) { + public JmlClause setName(final SimpleName name) { if (name == this.name) { return this; } @@ -85,13 +85,13 @@ public JmlClause setName(final SimpleName name) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlClause removeName() { + public JmlClause removeName() { return setName((SimpleName) null); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -106,7 +106,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -120,173 +120,173 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlCallableClause() { + public boolean isJmlCallableClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlCallableClause asJmlCallableClause() { + public JmlCallableClause asJmlCallableClause() { throw new IllegalStateException(f("%s is not JmlCallableClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlCallableClause() { + public Optional toJmlCallableClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlCallableClause(Consumer action) { + public void ifJmlCallableClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClauseLabel() { + public boolean isJmlClauseLabel() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClauseLabel asJmlClauseLabel() { + public JmlClauseLabel asJmlClauseLabel() { throw new IllegalStateException(f("%s is not JmlClauseLabel, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClauseLabel() { + public Optional toJmlClauseLabel() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClauseLabel(Consumer action) { + public void ifJmlClauseLabel(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlForallClause() { + public boolean isJmlForallClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlForallClause asJmlForallClause() { + public JmlForallClause asJmlForallClause() { throw new IllegalStateException(f("%s is not JmlForallClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlForallClause() { + public Optional toJmlForallClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlForallClause(Consumer action) { + public void ifJmlForallClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMultiExprClause() { + public boolean isJmlMultiExprClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMultiExprClause asJmlMultiExprClause() { + public JmlMultiExprClause asJmlMultiExprClause() { throw new IllegalStateException(f("%s is not JmlMultiExprClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMultiExprClause() { + public Optional toJmlMultiExprClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMultiExprClause(Consumer action) { + public void ifJmlMultiExprClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlOldClause() { + public boolean isJmlOldClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlOldClause asJmlOldClause() { + public JmlOldClause asJmlOldClause() { throw new IllegalStateException(f("%s is not JmlOldClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlOldClause() { + public Optional toJmlOldClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlOldClause(Consumer action) { + public void ifJmlOldClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSignalsClause() { + public boolean isJmlSignalsClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSignalsClause asJmlSignalsClause() { + public JmlSignalsClause asJmlSignalsClause() { throw new IllegalStateException(f("%s is not JmlSignalsClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSignalsClause() { + public Optional toJmlSignalsClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSignalsClause(Consumer action) { + public void ifJmlSignalsClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSignalsOnlyClause() { + public boolean isJmlSignalsOnlyClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSignalsOnlyClause asJmlSignalsOnlyClause() { + public JmlSignalsOnlyClause asJmlSignalsOnlyClause() { throw new IllegalStateException(f("%s is not JmlSignalsOnlyClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSignalsOnlyClause() { + public Optional toJmlSignalsOnlyClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSignalsOnlyClause(Consumer action) { + public void ifJmlSignalsOnlyClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSimpleExprClause() { + public boolean isJmlSimpleExprClause() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSimpleExprClause asJmlSimpleExprClause() { + public JmlSimpleExprClause asJmlSimpleExprClause() { throw new IllegalStateException(f("%s is not JmlSimpleExprClause, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSimpleExprClause() { + public Optional toJmlSimpleExprClause() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSimpleExprClause(Consumer action) { + public void ifJmlSimpleExprClause(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClauseIf() { + public boolean isJmlClauseIf() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClauseIf asJmlClauseIf() { + public JmlClauseIf asJmlClauseIf() { throw new IllegalStateException(f("%s is not JmlClauseIf, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClauseIf() { + public Optional toJmlClauseIf() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClauseIf(Consumer action) { + public void ifJmlClauseIf(Consumer action) { } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java index 94d5b8052f..6d32523012 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java @@ -20,7 +20,7 @@ * @author Alexander Weigl * @version 1 (2/22/21) */ -public class JmlClauseIf extends JmlClause implements MethodContractable { +public class JmlClauseIf extends JmlClause implements MethodContractable { private JmlClauseKind kind; @@ -29,7 +29,7 @@ public class JmlClauseIf extends JmlClause implements MethodContractable { private Expression condition; @AllFieldsConstructor - public JmlClauseIf(SimpleName name, Expression condition, JmlClauseKind kind, Expression then) { + public JmlClauseIf(SimpleName name, Expression condition, JmlClauseKind kind, Expression then) { this(null, name, condition, kind, then); } @@ -37,14 +37,14 @@ public JmlClauseIf(SimpleName name, Expression condition, JmlClauseKind kind, Ex * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClauseIf(TokenRange tokenRange) { + public JmlClauseIf(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -61,35 +61,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClauseIf clone() { + public JmlClauseIf clone() { return (JmlClauseIf) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return kind; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCondition() { + public Expression getCondition() { return condition; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseIf setCondition(final Expression condition) { + public JmlClauseIf setCondition(final Expression condition) { assertNotNull(condition); if (condition == this.condition) { return this; @@ -103,7 +103,7 @@ public JmlClauseIf setCondition(final Expression condition) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseIf setKind(final JmlClauseKind kind) { + public JmlClauseIf setKind(final JmlClauseKind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -114,12 +114,12 @@ public JmlClauseIf setKind(final JmlClauseKind kind) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getThen() { + public Expression getThen() { return then; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseIf setThen(final Expression then) { + public JmlClauseIf setThen(final Expression then) { assertNotNull(then); if (then == this.then) { return this; @@ -134,31 +134,31 @@ public JmlClauseIf setThen(final Expression then) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClauseIf() { + public boolean isJmlClauseIf() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClauseIf asJmlClauseIf() { + public JmlClauseIf asJmlClauseIf() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClauseIf() { + public Optional toJmlClauseIf() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClauseIf(Consumer action) { + public void ifJmlClauseIf(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClauseIfMetaModel getMetaModel() { + public JmlClauseIfMetaModel getMetaModel() { return JavaParserMetaModel.jmlClauseIfMetaModel; } @@ -166,7 +166,7 @@ public JmlClauseIfMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClauseIf(TokenRange tokenRange, SimpleName name, Expression condition, JmlClauseKind kind, Expression then) { + public JmlClauseIf(TokenRange tokenRange, SimpleName name, Expression condition, JmlClauseKind kind, Expression then) { super(tokenRange, name); setCondition(condition); setKind(kind); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java index e2d6022992..7a4e088d21 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java @@ -7,7 +7,7 @@ import java.util.EnumSet; import java.util.Optional; -public enum JmlClauseKind implements JmlKeyword { +public enum JmlClauseKind implements JmlKeyword { ENSURES(GeneratedJavaParserConstants.ENSURES), ENSURES_FREE(GeneratedJavaParserConstants.ENSURES_FREE), @@ -77,7 +77,7 @@ public enum JmlClauseKind implements JmlKeyword { } @Override - public String jmlSymbol() { + public String jmlSymbol() { return jmlSymbol; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java index 9034ab1aa4..a409a77590 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java @@ -23,7 +23,7 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlClauseLabel extends JmlClause { +public class JmlClauseLabel extends JmlClause { private JmlClauseKind kind; @@ -32,16 +32,16 @@ public class JmlClauseLabel extends JmlClause { private Expression expr; - public JmlClauseLabel() { + public JmlClauseLabel() { this(JmlClauseKind.NONE, null, new BooleanLiteralExpr(true)); } - public JmlClauseLabel(SimpleName label, Expression expr) { + public JmlClauseLabel(SimpleName label, Expression expr) { this(JmlClauseKind.NONE, label, expr); } @AllFieldsConstructor - public JmlClauseLabel(JmlClauseKind kind, SimpleName label, Expression expr) { + public JmlClauseLabel(JmlClauseKind kind, SimpleName label, Expression expr) { this(null, kind, label, expr); } @@ -49,7 +49,7 @@ public JmlClauseLabel(JmlClauseKind kind, SimpleName label, Expression expr) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClauseLabel(TokenRange tokenRange, JmlClauseKind kind, SimpleName label, Expression expr) { + public JmlClauseLabel(TokenRange tokenRange, JmlClauseKind kind, SimpleName label, Expression expr) { super(tokenRange); setKind(kind); setLabel(label); @@ -57,25 +57,25 @@ public JmlClauseLabel(TokenRange tokenRange, JmlClauseKind kind, SimpleName labe customInitialization(); } - public JmlClauseLabel(TokenRange range, JavaToken kind, SimpleName label, Expression expr) { + public JmlClauseLabel(TokenRange range, JavaToken kind, SimpleName label, Expression expr) { this(range, JmlClauseKind.getKindByToken(kind), label, expr); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -90,7 +90,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -109,7 +109,7 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlClauseLabel clone() { + public JmlClauseLabel clone() { return (JmlClauseLabel) accept(new CloneVisitor(), null); } @@ -117,18 +117,18 @@ public JmlClauseLabel clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlClauseLabel(TokenRange tokenRange) { + public JmlClauseLabel(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpr() { + public Expression getExpr() { return expr; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseLabel setExpr(final Expression expr) { + public JmlClauseLabel setExpr(final Expression expr) { assertNotNull(expr); if (expr == this.expr) { return this; @@ -142,12 +142,12 @@ public JmlClauseLabel setExpr(final Expression expr) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getLabel() { + public Optional getLabel() { return Optional.ofNullable(label); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseLabel setLabel(final SimpleName label) { + public JmlClauseLabel setLabel(final SimpleName label) { if (label == this.label) { return this; } @@ -161,23 +161,23 @@ public JmlClauseLabel setLabel(final SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlClauseLabelMetaModel getMetaModel() { + public JmlClauseLabelMetaModel getMetaModel() { return JavaParserMetaModel.jmlClauseLabelMetaModel; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlClauseLabel removeLabel() { + public JmlClauseLabel removeLabel() { return setLabel((SimpleName) null); } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return kind; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseLabel setKind(final JmlClauseKind kind) { + public JmlClauseLabel setKind(final JmlClauseKind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -189,25 +189,25 @@ public JmlClauseLabel setKind(final JmlClauseKind kind) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlClauseLabel() { + public boolean isJmlClauseLabel() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlClauseLabel asJmlClauseLabel() { + public JmlClauseLabel asJmlClauseLabel() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlClauseLabel() { + public Optional toJmlClauseLabel() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlClauseLabel(Consumer action) { + public void ifJmlClauseLabel(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java index 0512ba9acb..712f10867d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java @@ -20,7 +20,7 @@ * @author Alexander Weigl * @version 1 (3/14/21) */ -public class JmlContract extends Node implements Jmlish, NodeWithModifiers, NodeWithJmlTags { +public class JmlContract extends Node implements Jmlish, NodeWithModifiers, NodeWithJmlTags { private NodeList jmlTags = new NodeList<>(); @@ -37,42 +37,42 @@ public class JmlContract extends Node implements Jmlish, NodeWithModifiers subContracts = new NodeList<>(); - public JmlContract() { + public JmlContract() { this((TokenRange) null, new NodeList<>(), ContractType.METHOD, Behavior.NONE, null, new NodeList<>(), new NodeList<>(), new NodeList<>()); } @AllFieldsConstructor - public JmlContract(NodeList jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(NodeList jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { this(null, jmlTags, type, behavior, name, modifiers, clauses, subContracts); } - public JmlContract(ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { this((TokenRange) null, new NodeList<>(), type, behavior, name, modifiers, clauses, subContracts); } - public JmlContract(TokenRange range, Behavior behavior, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(TokenRange range, Behavior behavior, NodeList modifiers, NodeList clauses, NodeList subContracts) { this(range, new NodeList<>(), ContractType.METHOD, behavior, null, modifiers, clauses, subContracts); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Behavior getBehavior() { + public Behavior getBehavior() { return behavior; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setBehavior(final Behavior behavior) { + public JmlContract setBehavior(final Behavior behavior) { assertNotNull(behavior); if (behavior == this.behavior) { return this; @@ -83,12 +83,12 @@ public JmlContract setBehavior(final Behavior behavior) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getClauses() { + public NodeList getClauses() { return clauses; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setClauses(final NodeList clauses) { + public JmlContract setClauses(final NodeList clauses) { assertNotNull(clauses); if (clauses == this.clauses) { return this; @@ -102,12 +102,12 @@ public JmlContract setClauses(final NodeList clauses) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setModifiers(final NodeList modifiers) { + public JmlContract setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; @@ -121,12 +121,12 @@ public JmlContract setModifiers(final NodeList modifiers) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getSubContracts() { + public NodeList getSubContracts() { return subContracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setSubContracts(final NodeList subContracts) { + public JmlContract setSubContracts(final NodeList subContracts) { assertNotNull(subContracts); if (subContracts == this.subContracts) { return this; @@ -141,7 +141,7 @@ public JmlContract setSubContracts(final NodeList subContracts) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -180,7 +180,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -219,7 +219,7 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlContract clone() { + public JmlContract clone() { return (JmlContract) accept(new CloneVisitor(), null); } @@ -227,7 +227,7 @@ public JmlContract clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlContract(TokenRange tokenRange, boolean isLoopContract, Behavior behavior, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(TokenRange tokenRange, boolean isLoopContract, Behavior behavior, NodeList modifiers, NodeList clauses, NodeList subContracts) { super(tokenRange); setLoopContract(isLoopContract); setBehavior(behavior); @@ -239,27 +239,27 @@ public JmlContract(TokenRange tokenRange, boolean isLoopContract, Behavior behav @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlContractMetaModel getMetaModel() { + public JmlContractMetaModel getMetaModel() { return JavaParserMetaModel.jmlContractMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isLoopContract() { + public boolean isLoopContract() { return false; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setLoopContract(final boolean isLoopContract) { + public JmlContract setLoopContract(final boolean isLoopContract) { return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setJmlTags(final NodeList jmlTags) { + public JmlContract setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -273,12 +273,12 @@ public JmlContract setJmlTags(final NodeList jmlTags) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getName() { + public Optional getName() { return Optional.ofNullable(name); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setName(final SimpleName name) { + public JmlContract setName(final SimpleName name) { if (name == this.name) { return this; } @@ -291,12 +291,12 @@ public JmlContract setName(final SimpleName name) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ContractType getType() { + public ContractType getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlContract setType(final ContractType type) { + public JmlContract setType(final ContractType type) { assertNotNull(type); if (type == this.type) { return this; @@ -307,7 +307,7 @@ public JmlContract setType(final ContractType type) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlContract removeName() { + public JmlContract removeName() { return setName((SimpleName) null); } @@ -315,7 +315,7 @@ public JmlContract removeName() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlContract(TokenRange tokenRange, ContractType type, boolean isLoopContract, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(TokenRange tokenRange, ContractType type, boolean isLoopContract, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { super(tokenRange); setType(type); setLoopContract(isLoopContract); @@ -331,7 +331,7 @@ public JmlContract(TokenRange tokenRange, ContractType type, boolean isLoopContr * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlContract(TokenRange tokenRange, NodeList jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { + public JmlContract(TokenRange tokenRange, NodeList jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList modifiers, NodeList clauses, NodeList subContracts) { super(tokenRange); setJmlTags(jmlTags); setType(type); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java index 987d18217b..58bba7a50a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java @@ -20,12 +20,12 @@ * @author Alexander Weigl * @version 1 (2/22/21) */ -public class JmlForallClause extends JmlClause implements MethodContractable { +public class JmlForallClause extends JmlClause implements MethodContractable { private NodeList boundedVariables; @AllFieldsConstructor - public JmlForallClause(NodeList boundedVariables) { + public JmlForallClause(NodeList boundedVariables) { this(null, boundedVariables); } @@ -33,7 +33,7 @@ public JmlForallClause(NodeList boundedVariables) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlForallClause(TokenRange tokenRange, NodeList boundedVariables) { + public JmlForallClause(TokenRange tokenRange, NodeList boundedVariables) { super(tokenRange); setBoundedVariables(boundedVariables); customInitialization(); @@ -41,23 +41,23 @@ public JmlForallClause(TokenRange tokenRange, NodeList boundedVariabl @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getBoundedVariables() { + public NodeList getBoundedVariables() { return boundedVariables; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlForallClause setBoundedVariables(final NodeList boundedVariables) { + public JmlForallClause setBoundedVariables(final NodeList boundedVariables) { assertNotNull(boundedVariables); if (boundedVariables == this.boundedVariables) { return this; @@ -72,7 +72,7 @@ public JmlForallClause setBoundedVariables(final NodeList boundedVari @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -87,7 +87,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -102,42 +102,42 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlForallClause clone() { + public JmlForallClause clone() { return (JmlForallClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlForallClauseMetaModel getMetaModel() { + public JmlForallClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlForallClauseMetaModel; } @Override - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return JmlClauseKind.FORALL; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlForallClause() { + public boolean isJmlForallClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlForallClause asJmlForallClause() { + public JmlForallClause asJmlForallClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlForallClause() { + public Optional toJmlForallClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlForallClause(Consumer action) { + public void ifJmlForallClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java index e70d791e4d..a362c3592c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java @@ -22,7 +22,7 @@ * @author Alexander Weigl * @version 1 (02.05.24) */ -public class JmlMethodSignature extends Node { +public class JmlMethodSignature extends Node { @OptionalProperty private Type receiver; @@ -38,23 +38,23 @@ private JmlMethodSignature(@Nullable Type receiver, SimpleName name, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getArgumentTypes() { + public NodeList getArgumentTypes() { return argumentTypes; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodSignature setArgumentTypes(final NodeList argumentTypes) { + public JmlMethodSignature setArgumentTypes(final NodeList argumentTypes) { assertNotNull(argumentTypes); if (argumentTypes == this.argumentTypes) { return this; @@ -68,12 +68,12 @@ public JmlMethodSignature setArgumentTypes(final NodeList argumentTypes) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodSignature setName(final SimpleName name) { + public JmlMethodSignature setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; @@ -87,12 +87,12 @@ public JmlMethodSignature setName(final SimpleName name) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getReceiver() { + public Optional getReceiver() { return Optional.ofNullable(receiver); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMethodSignature setReceiver(final Type receiver) { + public JmlMethodSignature setReceiver(final Type receiver) { if (receiver == this.receiver) { return this; } @@ -105,13 +105,13 @@ public JmlMethodSignature setReceiver(final Type receiver) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public JmlMethodSignature removeReceiver() { + public JmlMethodSignature removeReceiver() { return setReceiver((Type) null); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -132,7 +132,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -157,13 +157,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlMethodSignature clone() { + public JmlMethodSignature clone() { return (JmlMethodSignature) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlMethodSignatureMetaModel getMetaModel() { + public JmlMethodSignatureMetaModel getMetaModel() { return JavaParserMetaModel.jmlMethodSignatureMetaModel; } @@ -171,7 +171,7 @@ public JmlMethodSignatureMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlMethodSignature(TokenRange tokenRange, Type receiver, SimpleName name, NodeList argumentTypes) { + public JmlMethodSignature(TokenRange tokenRange, Type receiver, SimpleName name, NodeList argumentTypes) { super(tokenRange); setReceiver(receiver); setName(name); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java index 7d13050e81..b79b78549d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java @@ -23,7 +23,7 @@ * @author Alexander Weigl * @version 1 (25.02.22) */ -public class JmlMultiExprClause extends JmlClause { +public class JmlMultiExprClause extends JmlClause { private JmlClauseKind kind; @@ -33,39 +33,39 @@ public class JmlMultiExprClause extends JmlClause { private NodeList expressions; @AllFieldsConstructor - public JmlMultiExprClause(JmlClauseKind kind, SimpleName name, NodeList heaps, NodeList expressions) { + public JmlMultiExprClause(JmlClauseKind kind, SimpleName name, NodeList heaps, NodeList expressions) { this(null, kind, name, heaps, expressions); } - public JmlMultiExprClause(TokenRange range, JavaToken begin, SimpleName label, NodeList heaps, NodeList exprs) { + public JmlMultiExprClause(TokenRange range, JavaToken begin, SimpleName label, NodeList heaps, NodeList exprs) { this(range, JmlClauseKind.getKindByToken(begin), label, heaps, exprs); } @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return kind; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getExpressions() { + public NodeList getExpressions() { return expressions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMultiExprClause setExpressions(final NodeList expressions) { + public JmlMultiExprClause setExpressions(final NodeList expressions) { assertNotNull(expressions); if (expressions == this.expressions) { return this; @@ -79,12 +79,12 @@ public JmlMultiExprClause setExpressions(final NodeList expressions) } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getHeaps() { + public Optional> getHeaps() { return Optional.ofNullable(heaps); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMultiExprClause setHeaps(final NodeList heaps) { + public JmlMultiExprClause setHeaps(final NodeList heaps) { if (heaps == this.heaps) { return this; } @@ -97,7 +97,7 @@ public JmlMultiExprClause setHeaps(final NodeList heaps) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMultiExprClause setKind(final JmlClauseKind kind) { + public JmlMultiExprClause setKind(final JmlClauseKind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -109,7 +109,7 @@ public JmlMultiExprClause setKind(final JmlClauseKind kind) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -132,7 +132,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -155,13 +155,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlMultiExprClause clone() { + public JmlMultiExprClause clone() { return (JmlMultiExprClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlMultiExprClauseMetaModel getMetaModel() { + public JmlMultiExprClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlMultiExprClauseMetaModel; } @@ -169,7 +169,7 @@ public JmlMultiExprClauseMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlMultiExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList heaps, NodeList expressions) { + public JmlMultiExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList heaps, NodeList expressions) { super(tokenRange, name); setKind(kind); setHeaps(heaps); @@ -177,11 +177,11 @@ public JmlMultiExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName customInitialization(); } - public NodeList getExpression() { + public NodeList getExpression() { return expressions; } - public JmlMultiExprClause setExpression(final NodeList expressions) { + public JmlMultiExprClause setExpression(final NodeList expressions) { assertNotNull(expressions); if (expressions == this.expressions) { return this; @@ -196,25 +196,25 @@ public JmlMultiExprClause setExpression(final NodeList expressions) @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMultiExprClause() { + public boolean isJmlMultiExprClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMultiExprClause asJmlMultiExprClause() { + public JmlMultiExprClause asJmlMultiExprClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMultiExprClause() { + public Optional toJmlMultiExprClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMultiExprClause(Consumer action) { + public void ifJmlMultiExprClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java index 2c631aad53..1ee369deb8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java @@ -19,7 +19,7 @@ * @author Alexander Weigl * @version 1 (12/12/21) */ -public class JmlOldClause extends JmlClause { +public class JmlOldClause extends JmlClause { /* private SimpleName name; @OptionalProperty @@ -29,7 +29,7 @@ public class JmlOldClause extends JmlClause { private VariableDeclarationExpr declarations; @AllFieldsConstructor - public JmlOldClause(VariableDeclarationExpr declarations) { + public JmlOldClause(VariableDeclarationExpr declarations) { this(null, declarations); } @@ -37,7 +37,7 @@ public JmlOldClause(VariableDeclarationExpr declarations) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlOldClause(TokenRange tokenRange, VariableDeclarationExpr declarations) { + public JmlOldClause(TokenRange tokenRange, VariableDeclarationExpr declarations) { super(tokenRange); setDeclarations(declarations); customInitialization(); @@ -45,23 +45,23 @@ public JmlOldClause(TokenRange tokenRange, VariableDeclarationExpr declarations) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr getDeclarations() { + public VariableDeclarationExpr getDeclarations() { return declarations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlOldClause setDeclarations(final VariableDeclarationExpr declarations) { + public JmlOldClause setDeclarations(final VariableDeclarationExpr declarations) { assertNotNull(declarations); if (declarations == this.declarations) { return this; @@ -76,7 +76,7 @@ public JmlOldClause setDeclarations(final VariableDeclarationExpr declarations) @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -89,42 +89,42 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlOldClause clone() { + public JmlOldClause clone() { return (JmlOldClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlOldClauseMetaModel getMetaModel() { + public JmlOldClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlOldClauseMetaModel; } @Override - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return JmlClauseKind.OLD; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlOldClause() { + public boolean isJmlOldClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlOldClause asJmlOldClause() { + public JmlOldClause asJmlOldClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlOldClause() { + public Optional toJmlOldClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlOldClause(Consumer action) { + public void ifJmlOldClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java index ebd2c9bb92..8d13fa7479 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java @@ -21,14 +21,14 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlSignalsClause extends JmlClause implements MethodContractable, BlockContractable { +public class JmlSignalsClause extends JmlClause implements MethodContractable, BlockContractable { private Parameter parameter; private Expression expression; @AllFieldsConstructor - public JmlSignalsClause(SimpleName name, Parameter parameter, Expression expression) { + public JmlSignalsClause(SimpleName name, Parameter parameter, Expression expression) { this(null, name, parameter, expression); } @@ -36,7 +36,7 @@ public JmlSignalsClause(SimpleName name, Parameter parameter, Expression express * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSignalsClause(TokenRange tokenRange, SimpleName name, Parameter parameter, Expression expression) { + public JmlSignalsClause(TokenRange tokenRange, SimpleName name, Parameter parameter, Expression expression) { super(tokenRange, name); setParameter(parameter); setExpression(expression); @@ -45,13 +45,13 @@ public JmlSignalsClause(TokenRange tokenRange, SimpleName name, Parameter parame @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -59,18 +59,18 @@ public void accept(final VoidVisitor v, final A arg) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSignalsClause(TokenRange tokenRange) { + public JmlSignalsClause(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSignalsClause setExpression(final Expression expression) { + public JmlSignalsClause setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; @@ -85,22 +85,22 @@ public JmlSignalsClause setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlSignalsClauseMetaModel getMetaModel() { + public JmlSignalsClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlSignalsClauseMetaModel; } @Override - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return JmlClauseKind.SIGNALS; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter getParameter() { + public Parameter getParameter() { return parameter; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSignalsClause setParameter(final Parameter parameter) { + public JmlSignalsClause setParameter(final Parameter parameter) { assertNotNull(parameter); if (parameter == this.parameter) { return this; @@ -115,7 +115,7 @@ public JmlSignalsClause setParameter(final Parameter parameter) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -132,31 +132,31 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlSignalsClause clone() { + public JmlSignalsClause clone() { return (JmlSignalsClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSignalsClause() { + public boolean isJmlSignalsClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSignalsClause asJmlSignalsClause() { + public JmlSignalsClause asJmlSignalsClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSignalsClause() { + public Optional toJmlSignalsClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSignalsClause(Consumer action) { + public void ifJmlSignalsClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java index db883885dd..366d49eeb5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java @@ -20,12 +20,12 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlSignalsOnlyClause extends JmlClause implements MethodContractable, BlockContractable { +public class JmlSignalsOnlyClause extends JmlClause implements MethodContractable, BlockContractable { private NodeList types; @AllFieldsConstructor - public JmlSignalsOnlyClause(NodeList types) { + public JmlSignalsOnlyClause(NodeList types) { this(null, types); } @@ -33,35 +33,35 @@ public JmlSignalsOnlyClause(NodeList types) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSignalsOnlyClause(TokenRange tokenRange, NodeList types) { + public JmlSignalsOnlyClause(TokenRange tokenRange, NodeList types) { super(tokenRange); setTypes(types); customInitialization(); } - public JmlSignalsOnlyClause() { + public JmlSignalsOnlyClause() { } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public boolean hasParentNode() { + public boolean hasParentNode() { return false; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -76,7 +76,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -91,7 +91,7 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlSignalsOnlyClause clone() { + public JmlSignalsOnlyClause clone() { return (JmlSignalsOnlyClause) accept(new CloneVisitor(), null); } @@ -99,18 +99,18 @@ public JmlSignalsOnlyClause clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSignalsOnlyClause(TokenRange tokenRange) { + public JmlSignalsOnlyClause(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypes() { + public NodeList getTypes() { return types; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSignalsOnlyClause setTypes(final NodeList types) { + public JmlSignalsOnlyClause setTypes(final NodeList types) { assertNotNull(types); if (types == this.types) { return this; @@ -125,36 +125,36 @@ public JmlSignalsOnlyClause setTypes(final NodeList types) { @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlSignalsOnlyClauseMetaModel getMetaModel() { + public JmlSignalsOnlyClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlSignalsOnlyClauseMetaModel; } @Override - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return JmlClauseKind.SIGNALS_ONLY; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSignalsOnlyClause() { + public boolean isJmlSignalsOnlyClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSignalsOnlyClause asJmlSignalsOnlyClause() { + public JmlSignalsOnlyClause asJmlSignalsOnlyClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSignalsOnlyClause() { + public Optional toJmlSignalsOnlyClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSignalsOnlyClause(Consumer action) { + public void ifJmlSignalsOnlyClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java index ba1e7f32c9..6875d92891 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java @@ -23,7 +23,7 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlSimpleExprClause extends JmlClause implements MethodContractable, BlockContractable { +public class JmlSimpleExprClause extends JmlClause implements MethodContractable, BlockContractable { private JmlClauseKind kind; @@ -32,33 +32,33 @@ public class JmlSimpleExprClause extends JmlClause implements MethodContractable private Expression expression; - public JmlSimpleExprClause() { + public JmlSimpleExprClause() { } @AllFieldsConstructor - public JmlSimpleExprClause(JmlClauseKind kind, SimpleName name, NodeList heaps, Expression expression) { + public JmlSimpleExprClause(JmlClauseKind kind, SimpleName name, NodeList heaps, Expression expression) { this(null, kind, name, heaps, expression); } - public JmlSimpleExprClause(TokenRange range, JavaToken kind, NodeList heaps, Expression expression) { + public JmlSimpleExprClause(TokenRange range, JavaToken kind, NodeList heaps, Expression expression) { this(range, JmlClauseKind.getKindByToken(kind), null, heaps, expression); } - public JmlSimpleExprClause(TokenRange range, JavaToken kind, Expression expr) { + public JmlSimpleExprClause(TokenRange range, JavaToken kind, Expression expr) { this(range, kind, (SimpleName) null, expr); } - public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, Expression expr) { + public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, Expression expr) { this(range, JmlClauseKind.getKindByToken(kind), name, null, expr); } - public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, NodeList heaps, Expression expr) { + public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, NodeList heaps, Expression expr) { this(range, JmlClauseKind.getKindByToken(kind), name, heaps, expr); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -75,7 +75,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -96,19 +96,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlSimpleExprClause clone() { + public JmlSimpleExprClause clone() { return (JmlSimpleExprClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -116,18 +116,18 @@ public void accept(final VoidVisitor v, final A arg) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSimpleExprClause(TokenRange tokenRange) { + public JmlSimpleExprClause(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSimpleExprClause setExpression(final NodeList expression) { + public JmlSimpleExprClause setExpression(final NodeList expression) { assertNotNull(expression); notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); if (this.expression != null) @@ -137,12 +137,12 @@ public JmlSimpleExprClause setExpression(final NodeList expression) } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getHeaps() { + public Optional> getHeaps() { return Optional.ofNullable(heaps); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSimpleExprClause setHeaps(final NodeList heaps) { + public JmlSimpleExprClause setHeaps(final NodeList heaps) { if (heaps == this.heaps) { return this; } @@ -156,7 +156,7 @@ public JmlSimpleExprClause setHeaps(final NodeList heaps) { @Override @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlClauseKind getKind() { + public JmlClauseKind getKind() { return kind; } @@ -164,7 +164,7 @@ public JmlClauseKind getKind() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSimpleExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList heaps, Expression expression) { + public JmlSimpleExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList heaps, Expression expression) { super(tokenRange, name); setKind(kind); setHeaps(heaps); @@ -173,7 +173,7 @@ public JmlSimpleExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSimpleExprClause setKind(final JmlClauseKind kind) { + public JmlSimpleExprClause setKind(final JmlClauseKind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -184,7 +184,7 @@ public JmlSimpleExprClause setKind(final JmlClauseKind kind) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSimpleExprClause setExpression(final Expression expression) { + public JmlSimpleExprClause setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; @@ -199,31 +199,31 @@ public JmlSimpleExprClause setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlSimpleExprClauseMetaModel getMetaModel() { + public JmlSimpleExprClauseMetaModel getMetaModel() { return JavaParserMetaModel.jmlSimpleExprClauseMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSimpleExprClause() { + public boolean isJmlSimpleExprClause() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSimpleExprClause asJmlSimpleExprClause() { + public JmlSimpleExprClause asJmlSimpleExprClause() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSimpleExprClause() { + public Optional toJmlSimpleExprClause() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSimpleExprClause(Consumer action) { + public void ifJmlSimpleExprClause(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java index bdf65b2f93..cf834953bd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (3/16/21) */ -public interface LoopContractable { +public interface LoopContractable { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java index 2706fce13e..3a8182efe8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java @@ -4,5 +4,5 @@ * @author Alexander Weigl * @version 1 (3/16/21) */ -public interface MethodContractable { +public interface MethodContractable { } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java index 63dfa7c270..ccfc36f067 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java @@ -17,34 +17,34 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class JmlDoc extends Node { +public class JmlDoc extends Node { private JavaToken content; @AllFieldsConstructor - public JmlDoc(JavaToken content) { + public JmlDoc(JavaToken content) { this(new TokenRange(content, content), content); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JavaToken getContent() { + public JavaToken getContent() { return content; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlDoc setContent(final JavaToken content) { + public JmlDoc setContent(final JavaToken content) { assertNotNull(content); if (content == this.content) { return this; @@ -56,13 +56,13 @@ public JmlDoc setContent(final JavaToken content) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlDoc clone() { + public JmlDoc clone() { return (JmlDoc) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlDocMetaModel getMetaModel() { + public JmlDocMetaModel getMetaModel() { return JavaParserMetaModel.jmlDocMetaModel; } @@ -70,7 +70,7 @@ public JmlDocMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlDoc(TokenRange tokenRange, JavaToken content) { + public JmlDoc(TokenRange tokenRange, JavaToken content) { super(tokenRange); setContent(content); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocContainer.java index 4ae5f81ce8..3d4536a4e6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocContainer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocContainer.java @@ -7,7 +7,7 @@ * @author Alexander Weigl * @version 1 (26.05.22) */ -public interface JmlDocContainer { +public interface JmlDocContainer { @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") NodeList getJmlComments(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java index 2041176179..b23b912b2b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java @@ -22,70 +22,69 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class JmlDocDeclaration extends BodyDeclaration implements JmlDocContainer { +public class JmlDocDeclaration extends BodyDeclaration implements JmlDocContainer { private NodeList jmlComments; @AllFieldsConstructor - public JmlDocDeclaration(NodeList jmlComments) { + public JmlDocDeclaration(NodeList jmlComments) { super((TokenRange) null); this.jmlComments = jmlComments; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlComments() { + public NodeList getJmlComments() { return jmlComments; } - public void setJmlComments(List jmlComments) { + public void setJmlComments(List jmlComments) { // this.jmlComments = jmlComments; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocDeclaration() { + public boolean isJmlDocDeclaration() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocDeclaration asJmlDocDeclaration() { + public JmlDocDeclaration asJmlDocDeclaration() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocDeclaration() { + public Optional toJmlDocDeclaration() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocDeclaration(Consumer action) { + public void ifJmlDocDeclaration(Consumer action) { action.accept(this); } - public JmlDocDeclaration setJmlComments(final JavaToken jmlComments) { + public JmlDocDeclaration setJmlComments(final JavaToken jmlComments) { assertNotNull(jmlComments); - notifyPropertyChange(ObservableProperty.JML_COMMENTS, this.jmlComments, jmlComments); return this; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -100,7 +99,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -115,27 +114,27 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlDocDeclaration clone() { + public JmlDocDeclaration clone() { return (JmlDocDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlDocDeclarationMetaModel getMetaModel() { + public JmlDocDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.jmlDocDeclarationMetaModel; } /** * This constructor is used by the parser and is considered private. */ - public JmlDocDeclaration(TokenRange tokenRange, JavaToken jmlComments) { + public JmlDocDeclaration(TokenRange tokenRange, JavaToken jmlComments) { super(tokenRange); setJmlComments(jmlComments); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlDocDeclaration setJmlComments(final NodeList jmlComments) { + public JmlDocDeclaration setJmlComments(final NodeList jmlComments) { assertNotNull(jmlComments); if (jmlComments == this.jmlComments) { return this; @@ -152,7 +151,7 @@ public JmlDocDeclaration setJmlComments(final NodeList jmlComments) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlDocDeclaration(TokenRange tokenRange, NodeList jmlComments) { + public JmlDocDeclaration(TokenRange tokenRange, NodeList jmlComments) { super(tokenRange); setJmlComments(jmlComments); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocModifier.java index 543798c231..199c87b4e7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocModifier.java @@ -8,26 +8,26 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class JmlDocModifier implements Modifier.Keyword, JmlDocContainer { +public class JmlDocModifier implements Modifier.Keyword, JmlDocContainer { private final NodeList jmlComments; @AllFieldsConstructor - public JmlDocModifier(NodeList jmlComments) { + public JmlDocModifier(NodeList jmlComments) { this.jmlComments = jmlComments; } @Override - public String asString() { + public String asString() { return "[[JML modifiers]]"; } @Override - public String name() { + public String name() { return asString(); } - public NodeList getJmlComments() { + public NodeList getJmlComments() { return jmlComments; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java index 0be3a64a9f..47ffa1c4c2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java @@ -21,65 +21,64 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class JmlDocStmt extends Statement implements JmlDocContainer { +public class JmlDocStmt extends Statement implements JmlDocContainer { private NodeList jmlComments; @AllFieldsConstructor - public JmlDocStmt(NodeList jmlComments) { + public JmlDocStmt(NodeList jmlComments) { this(null, jmlComments); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocStmt() { + public boolean isJmlDocStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocStmt asJmlDocStmt() { + public JmlDocStmt asJmlDocStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocStmt() { + public Optional toJmlDocStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocStmt(Consumer action) { + public void ifJmlDocStmt(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlComments() { + public NodeList getJmlComments() { return jmlComments; } - public JmlDocStmt setJmlComments(final JavaToken jmlComments) { + public JmlDocStmt setJmlComments(final JavaToken jmlComments) { assertNotNull(jmlComments); - notifyPropertyChange(ObservableProperty.JML_COMMENTS, this.jmlComments, jmlComments); return this; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -94,7 +93,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -109,27 +108,27 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlDocStmt clone() { + public JmlDocStmt clone() { return (JmlDocStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlDocStmtMetaModel getMetaModel() { + public JmlDocStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlDocStmtMetaModel; } /** * This constructor is used by the parser and is considered private. */ - public JmlDocStmt(TokenRange tokenRange, JavaToken jmlComments) { + public JmlDocStmt(TokenRange tokenRange, JavaToken jmlComments) { super(tokenRange); setJmlComments(jmlComments); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlDocStmt setJmlComments(final NodeList jmlComments) { + public JmlDocStmt setJmlComments(final NodeList jmlComments) { assertNotNull(jmlComments); if (jmlComments == this.jmlComments) { return this; @@ -146,7 +145,7 @@ public JmlDocStmt setJmlComments(final NodeList jmlComments) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlDocStmt(TokenRange tokenRange, NodeList jmlComments) { + public JmlDocStmt(TokenRange tokenRange, NodeList jmlComments) { super(tokenRange); setJmlComments(jmlComments); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java index 2cf49cd5d6..e0510f93e9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java @@ -21,16 +21,16 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public class JmlDocType extends TypeDeclaration implements JmlDocContainer { +public class JmlDocType extends TypeDeclaration implements JmlDocContainer { private NodeList jmlComments; - public JmlDocType(NodeList jmlComments) { + public JmlDocType(NodeList jmlComments) { this.jmlComments = jmlComments; } @AllFieldsConstructor - public JmlDocType(NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members, NodeList jmlComments) { + public JmlDocType(NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members, NodeList jmlComments) { super(modifiers, annotations, name, members); this.jmlComments = jmlComments; } @@ -39,59 +39,59 @@ public JmlDocType(NodeList modifiers, NodeList annotat * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlDocType(TokenRange tokenRange, NodeList jmlComments) { + public JmlDocType(TokenRange tokenRange, NodeList jmlComments) { setJmlComments(jmlComments); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public ResolvedReferenceTypeDeclaration resolve() { + public ResolvedReferenceTypeDeclaration resolve() { return null; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocType() { + public boolean isJmlDocType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocType asJmlDocType() { + public JmlDocType asJmlDocType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocType() { + public Optional toJmlDocType() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocType(Consumer action) { + public void ifJmlDocType(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlComments() { + public NodeList getJmlComments() { return jmlComments; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlDocType setJmlComments(final NodeList jmlComments) { + public JmlDocType setJmlComments(final NodeList jmlComments) { assertNotNull(jmlComments); if (jmlComments == this.jmlComments) { return this; @@ -106,7 +106,7 @@ public JmlDocType setJmlComments(final NodeList jmlComments) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -121,7 +121,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -136,13 +136,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlDocType clone() { + public JmlDocType clone() { return (JmlDocType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlDocTypeMetaModel getMetaModel() { + public JmlDocTypeMetaModel getMetaModel() { return JavaParserMetaModel.jmlDocTypeMetaModel; } @@ -150,7 +150,7 @@ public JmlDocTypeMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlDocType(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members, NodeList jmlComments) { + public JmlDocType(TokenRange tokenRange, NodeList modifiers, NodeList annotations, SimpleName name, NodeList> members, NodeList jmlComments) { super(tokenRange, modifiers, annotations, name, members); setJmlComments(jmlComments); customInitialization(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java index 72d655919a..f646651462 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java @@ -21,7 +21,7 @@ * @author Alexander Weigl * @version 1 (7/3/21) */ -public class JmlBinaryInfixExpr extends Expression { +public class JmlBinaryInfixExpr extends Expression { private Expression left; @@ -29,12 +29,12 @@ public class JmlBinaryInfixExpr extends Expression { private SimpleName operator; - public JmlBinaryInfixExpr(Expression left, Expression right, JavaToken operator) { + public JmlBinaryInfixExpr(Expression left, Expression right, JavaToken operator) { this(null, left, right, nameFromToken(operator)); } @AllFieldsConstructor - public JmlBinaryInfixExpr(Expression left, Expression right, SimpleName operator) { + public JmlBinaryInfixExpr(Expression left, Expression right, SimpleName operator) { this(null, left, right, operator); } @@ -42,7 +42,7 @@ public JmlBinaryInfixExpr(Expression left, Expression right, SimpleName operator * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlBinaryInfixExpr(TokenRange tokenRange, Expression left, Expression right, SimpleName operator) { + public JmlBinaryInfixExpr(TokenRange tokenRange, Expression left, Expression right, SimpleName operator) { super(tokenRange); setLeft(left); setRight(right); @@ -50,7 +50,7 @@ public JmlBinaryInfixExpr(TokenRange tokenRange, Expression left, Expression rig customInitialization(); } - public JmlBinaryInfixExpr(TokenRange range, Expression left, Expression right, JavaToken op) { + public JmlBinaryInfixExpr(TokenRange range, Expression left, Expression right, JavaToken op) { this(range, left, right, nameFromToken(op)); } @@ -60,47 +60,47 @@ private static SimpleName nameFromToken(JavaToken op) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBinaryInfixExpr() { + public boolean isJmlBinaryInfixExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlBinaryInfixExpr asJmlBinaryInfixExpr() { + public JmlBinaryInfixExpr asJmlBinaryInfixExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBinaryInfixExpr() { + public Optional toJmlBinaryInfixExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBinaryInfixExpr(Consumer action) { + public void ifJmlBinaryInfixExpr(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getLeft() { + public Expression getLeft() { return left; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlBinaryInfixExpr setLeft(final Expression left) { + public JmlBinaryInfixExpr setLeft(final Expression left) { assertNotNull(left); if (left == this.left) { return this; @@ -114,12 +114,12 @@ public JmlBinaryInfixExpr setLeft(final Expression left) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getOperator() { + public SimpleName getOperator() { return operator; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlBinaryInfixExpr setOperator(final SimpleName operator) { + public JmlBinaryInfixExpr setOperator(final SimpleName operator) { assertNotNull(operator); if (operator == this.operator) { return this; @@ -133,12 +133,12 @@ public JmlBinaryInfixExpr setOperator(final SimpleName operator) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getRight() { + public Expression getRight() { return right; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlBinaryInfixExpr setRight(final Expression right) { + public JmlBinaryInfixExpr setRight(final Expression right) { assertNotNull(right); if (right == this.right) { return this; @@ -153,7 +153,7 @@ public JmlBinaryInfixExpr setRight(final Expression right) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -174,13 +174,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlBinaryInfixExpr clone() { + public JmlBinaryInfixExpr clone() { return (JmlBinaryInfixExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlBinaryInfixExprMetaModel getMetaModel() { + public JmlBinaryInfixExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlBinaryInfixExprMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java index b9bd8a2320..eb82749a81 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java @@ -24,7 +24,7 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlLabelExpr extends Expression implements Jmlish { +public class JmlLabelExpr extends Expression implements Jmlish { private Kind kind; @@ -33,11 +33,11 @@ public class JmlLabelExpr extends Expression implements Jmlish { private Expression expression; @AllFieldsConstructor - public JmlLabelExpr(final Kind kind, SimpleName label, final Expression expression) { + public JmlLabelExpr(final Kind kind, SimpleName label, final Expression expression) { this(null, kind, label, expression); } - public JmlLabelExpr(TokenRange range, JavaToken quant, SimpleName name, Expression expr) { + public JmlLabelExpr(TokenRange range, JavaToken quant, SimpleName name, Expression expr) { this(range, token2Kind(quant), name, expr); } @@ -45,7 +45,7 @@ private static Kind token2Kind(JavaToken token) { return Arrays.stream(Kind.values()).filter(it -> it.jmlSymbol().equals(token.getText())).findFirst().get(); } - public enum Kind implements JmlKeyword { + public enum Kind implements JmlKeyword { NEUTRAL("\\lbl"), POSITIVE("\\lblpos"), NEGATIVE("\\lblneg"); @@ -56,55 +56,55 @@ public enum Kind implements JmlKeyword { } @Override - public String jmlSymbol() { + public String jmlSymbol() { return symbol; } } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public boolean hasParentNode() { + public boolean hasParentNode() { return false; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabel() { + public boolean isJmlLabel() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelExpr asJmlLabel() { + public JmlLabelExpr asJmlLabel() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabel() { + public Optional toJmlLabel() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabel(Consumer action) { + public void ifJmlLabel(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -121,7 +121,7 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlLabelExpr clone() { + public JmlLabelExpr clone() { return (JmlLabelExpr) accept(new CloneVisitor(), null); } @@ -129,18 +129,18 @@ public JmlLabelExpr clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlLabelExpr(TokenRange tokenRange) { + public JmlLabelExpr(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLabelExpr setExpression(final Expression expression) { + public JmlLabelExpr setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; @@ -154,12 +154,12 @@ public JmlLabelExpr setExpression(final Expression expression) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Kind getKind() { + public Kind getKind() { return kind; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLabelExpr setKind(final Kind kind) { + public JmlLabelExpr setKind(final Kind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -172,7 +172,7 @@ public JmlLabelExpr setKind(final Kind kind) { /** * This constructor is used by the parser and is considered private. */ - public JmlLabelExpr(TokenRange tokenRange, Kind kind, Expression expression) { + public JmlLabelExpr(TokenRange tokenRange, Kind kind, Expression expression) { super(tokenRange); setKind(kind); setExpression(expression); @@ -180,12 +180,12 @@ public JmlLabelExpr(TokenRange tokenRange, Kind kind, Expression expression) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getLabel() { + public SimpleName getLabel() { return label; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLabelExpr setLabel(final SimpleName label) { + public JmlLabelExpr setLabel(final SimpleName label) { assertNotNull(label); if (label == this.label) { return this; @@ -202,7 +202,7 @@ public JmlLabelExpr setLabel(final SimpleName label) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlLabelExpr(TokenRange tokenRange, Kind kind, SimpleName label, Expression expression) { + public JmlLabelExpr(TokenRange tokenRange, Kind kind, SimpleName label, Expression expression) { super(tokenRange); setKind(kind); setLabel(label); @@ -212,31 +212,31 @@ public JmlLabelExpr(TokenRange tokenRange, Kind kind, SimpleName label, Expressi @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabelExpr() { + public boolean isJmlLabelExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelExpr asJmlLabelExpr() { + public JmlLabelExpr asJmlLabelExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabelExpr() { + public Optional toJmlLabelExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabelExpr(Consumer action) { + public void ifJmlLabelExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlLabelExprMetaModel getMetaModel() { + public JmlLabelExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlLabelExprMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java index 3c6efb7493..67a554e11b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java @@ -21,66 +21,66 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlLetExpr extends Expression implements Jmlish { +public class JmlLetExpr extends Expression implements Jmlish { private VariableDeclarationExpr variables; private Expression body; @AllFieldsConstructor - public JmlLetExpr(VariableDeclarationExpr variables, Expression body) { + public JmlLetExpr(VariableDeclarationExpr variables, Expression body) { this.variables = variables; this.body = body; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public boolean hasParentNode() { + public boolean hasParentNode() { return false; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLetExpr() { + public boolean isJmlLetExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLetExpr asJmlLetExpr() { + public JmlLetExpr asJmlLetExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLetExpr() { + public Optional toJmlLetExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLetExpr(Consumer action) { + public void ifJmlLetExpr(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getBody() { + public Expression getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLetExpr setBody(final Expression body) { + public JmlLetExpr setBody(final Expression body) { assertNotNull(body); if (body == this.body) { return this; @@ -94,12 +94,12 @@ public JmlLetExpr setBody(final Expression body) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr getVariables() { + public VariableDeclarationExpr getVariables() { return variables; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLetExpr setVariables(final VariableDeclarationExpr variables) { + public JmlLetExpr setVariables(final VariableDeclarationExpr variables) { assertNotNull(variables); if (variables == this.variables) { return this; @@ -114,7 +114,7 @@ public JmlLetExpr setVariables(final VariableDeclarationExpr variables) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -131,13 +131,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlLetExpr clone() { + public JmlLetExpr clone() { return (JmlLetExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlLetExprMetaModel getMetaModel() { + public JmlLetExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlLetExprMetaModel; } @@ -145,7 +145,7 @@ public JmlLetExprMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlLetExpr(TokenRange tokenRange, VariableDeclarationExpr variables, Expression body) { + public JmlLetExpr(TokenRange tokenRange, VariableDeclarationExpr variables, Expression body) { super(tokenRange); setVariables(variables); setBody(body); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java index 647e27c851..30c12aad35 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java @@ -21,15 +21,15 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlMultiCompareExpr extends Expression implements Jmlish { +public class JmlMultiCompareExpr extends Expression implements Jmlish { - public JmlMultiCompareExpr(TokenRange range, NodeList expressions, List ops) { + public JmlMultiCompareExpr(TokenRange range, NodeList expressions, List ops) { this(range, expressions, new Operators(ops)); } public static class Operators extends ArrayList { - public Operators(List ops) { + public Operators(List ops) { super(ops); } } @@ -40,7 +40,7 @@ public Operators(List ops) { private Operators operators; @AllFieldsConstructor - public JmlMultiCompareExpr(NodeList expressions, Operators operators) { + public JmlMultiCompareExpr(NodeList expressions, Operators operators) { this(null, expressions, operators); } @@ -48,7 +48,7 @@ public JmlMultiCompareExpr(NodeList expressions, Operators operators * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlMultiCompareExpr(TokenRange tokenRange, NodeList expressions, Operators operators) { + public JmlMultiCompareExpr(TokenRange tokenRange, NodeList expressions, Operators operators) { super(tokenRange); setExpressions(expressions); setOperators(operators); @@ -57,49 +57,49 @@ public JmlMultiCompareExpr(TokenRange tokenRange, NodeList expressio @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlMultiCompareExpr() { + public boolean isJmlMultiCompareExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlMultiCompareExpr asJmlMultiCompareExpr() { + public JmlMultiCompareExpr asJmlMultiCompareExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlMultiCompareExpr() { + public Optional toJmlMultiCompareExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlMultiCompareExpr(Consumer action) { + public void ifJmlMultiCompareExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlMultiCompareExpr clone() { + public JmlMultiCompareExpr clone() { return (JmlMultiCompareExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlMultiCompareExprMetaModel getMetaModel() { + public JmlMultiCompareExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlMultiCompareExprMetaModel; } @@ -107,18 +107,18 @@ public JmlMultiCompareExprMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlMultiCompareExpr(TokenRange tokenRange) { + public JmlMultiCompareExpr(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getExpressions() { + public NodeList getExpressions() { return expressions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMultiCompareExpr setExpressions(final NodeList expressions) { + public JmlMultiCompareExpr setExpressions(final NodeList expressions) { assertNotNull(expressions); if (expressions == this.expressions) { return this; @@ -132,12 +132,12 @@ public JmlMultiCompareExpr setExpressions(final NodeList expressions } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Operators getOperators() { + public Operators getOperators() { return operators; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlMultiCompareExpr setOperators(final Operators operators) { + public JmlMultiCompareExpr setOperators(final Operators operators) { assertNotNull(operators); if (operators == this.operators) { return this; @@ -149,7 +149,7 @@ public JmlMultiCompareExpr setOperators(final Operators operators) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -164,7 +164,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java index e3a4151c54..3664671fc8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java @@ -44,15 +44,15 @@ * * @author Alexander Weigl */ -public class JmlQuantifiedExpr extends Expression implements Jmlish { +public class JmlQuantifiedExpr extends Expression implements Jmlish { - public interface JmlBinder extends JmlKeyword { + public interface JmlBinder extends JmlKeyword { } /** * 12.4.24.2 Generalized Quantifiers */ - public enum JmlDefaultBinder implements JmlBinder { + public enum JmlDefaultBinder implements JmlBinder { FORALL("\\forall"), EXISTS("\\exists"), @@ -83,7 +83,7 @@ public static JmlBinder valueOf(JavaToken binder) { } @Override - public String jmlSymbol() { + public String jmlSymbol() { return symbol; } } @@ -96,20 +96,20 @@ public String jmlSymbol() { @NonEmptyProperty private NodeList expressions; - public JmlQuantifiedExpr() { + public JmlQuantifiedExpr() { this(null, JmlDefaultBinder.EXISTS, new NodeList<>(), new NodeList<>()); } - public JmlQuantifiedExpr(final NodeList variables, final Expression expressions) { + public JmlQuantifiedExpr(final NodeList variables, final Expression expressions) { this(null, JmlDefaultBinder.EXISTS, variables, new NodeList<>(expressions)); } @AllFieldsConstructor - public JmlQuantifiedExpr(final JmlBinder binder, final NodeList variables, final Expression expressions) { + public JmlQuantifiedExpr(final JmlBinder binder, final NodeList variables, final Expression expressions) { this(null, binder, variables, new NodeList<>(expressions)); } - public JmlQuantifiedExpr(TokenRange tokenRange, JavaToken binder, NodeList variables, NodeList expressions) { + public JmlQuantifiedExpr(TokenRange tokenRange, JavaToken binder, NodeList variables, NodeList expressions) { this(tokenRange, JmlDefaultBinder.valueOf(binder), variables, new NodeList<>(expressions)); } @@ -117,7 +117,7 @@ public JmlQuantifiedExpr(TokenRange tokenRange, JavaToken binder, NodeList variables, NodeList expressions) { + public JmlQuantifiedExpr(TokenRange tokenRange, JmlBinder binder, NodeList variables, NodeList expressions) { super(tokenRange); setBinder(binder); setVariables(variables); @@ -127,47 +127,47 @@ public JmlQuantifiedExpr(TokenRange tokenRange, JmlBinder binder, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBindingExpr() { + public boolean isJmlBindingExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlQuantifiedExpr asJmlBindingExpr() { + public JmlQuantifiedExpr asJmlBindingExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBindingExpr() { + public Optional toJmlBindingExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBindingExpr(Consumer action) { + public void ifJmlBindingExpr(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getExpressions() { + public NodeList getExpressions() { return expressions; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlQuantifiedExpr setExpressions(final NodeList expressions) { + public JmlQuantifiedExpr setExpressions(final NodeList expressions) { assertNotNull(expressions); if (expressions == this.expressions) { return this; @@ -181,12 +181,12 @@ public JmlQuantifiedExpr setExpressions(final NodeList expressions) } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getVariables() { + public NodeList getVariables() { return variables; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlQuantifiedExpr setVariables(final NodeList variables) { + public JmlQuantifiedExpr setVariables(final NodeList variables) { assertNotNull(variables); if (variables == this.variables) { return this; @@ -201,7 +201,7 @@ public JmlQuantifiedExpr setVariables(final NodeList variables) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -222,7 +222,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -243,17 +243,17 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlQuantifiedExpr clone() { + public JmlQuantifiedExpr clone() { return (JmlQuantifiedExpr) accept(new CloneVisitor(), null); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlBinder getBinder() { + public JmlBinder getBinder() { return binder; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlQuantifiedExpr setBinder(final JmlBinder binder) { + public JmlQuantifiedExpr setBinder(final JmlBinder binder) { assertNotNull(binder); if (binder == this.binder) { return this; @@ -265,31 +265,31 @@ public JmlQuantifiedExpr setBinder(final JmlBinder binder) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlQuantifiedExpr() { + public boolean isJmlQuantifiedExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlQuantifiedExpr asJmlQuantifiedExpr() { + public JmlQuantifiedExpr asJmlQuantifiedExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlQuantifiedExpr() { + public Optional toJmlQuantifiedExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlQuantifiedExpr(Consumer action) { + public void ifJmlQuantifiedExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlQuantifiedExprMetaModel getMetaModel() { + public JmlQuantifiedExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlQuantifiedExprMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java index 9905f88b53..52a59ff4aa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java @@ -27,17 +27,17 @@ * @author Alexander Weigl * @version 1 (3/20/21) */ -public class JmlSetComprehensionExpr extends Expression implements Jmlish { +public class JmlSetComprehensionExpr extends Expression implements Jmlish { private VariableDeclarator binding; private Expression predicate; - public JmlSetComprehensionExpr() { + public JmlSetComprehensionExpr() { } @AllFieldsConstructor - public JmlSetComprehensionExpr(VariableDeclarator binding, Expression predicate) { + public JmlSetComprehensionExpr(VariableDeclarator binding, Expression predicate) { this.binding = binding; this.predicate = predicate; } @@ -46,7 +46,7 @@ public JmlSetComprehensionExpr(VariableDeclarator binding, Expression predicate) * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlSetComprehensionExpr(TokenRange tokenRange, VariableDeclarator binding, Expression predicate) { + public JmlSetComprehensionExpr(TokenRange tokenRange, VariableDeclarator binding, Expression predicate) { super(tokenRange); setBinding(binding); setPredicate(predicate); @@ -55,47 +55,47 @@ public JmlSetComprehensionExpr(TokenRange tokenRange, VariableDeclarator binding @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSetComprehension() { + public boolean isJmlSetComprehension() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlSetComprehensionExpr asJmlSetComprehension() { + public JmlSetComprehensionExpr asJmlSetComprehension() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlSetComprehension() { + public Optional toJmlSetComprehension() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlSetComprehension(Consumer action) { + public void ifJmlSetComprehension(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarator getBinding() { + public VariableDeclarator getBinding() { return binding; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSetComprehensionExpr setBinding(final VariableDeclarator binding) { + public JmlSetComprehensionExpr setBinding(final VariableDeclarator binding) { assertNotNull(binding); if (binding == this.binding) { return this; @@ -109,12 +109,12 @@ public JmlSetComprehensionExpr setBinding(final VariableDeclarator binding) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getPredicate() { + public Expression getPredicate() { return predicate; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlSetComprehensionExpr setPredicate(final Expression predicate) { + public JmlSetComprehensionExpr setPredicate(final Expression predicate) { assertNotNull(predicate); if (predicate == this.predicate) { return this; @@ -129,7 +129,7 @@ public JmlSetComprehensionExpr setPredicate(final Expression predicate) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -146,32 +146,37 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlSetComprehensionExpr clone() { + public JmlSetComprehensionExpr clone() { return (JmlSetComprehensionExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlSetComprehensionExprMetaModel getMetaModel() { + public JmlSetComprehensionExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlSetComprehensionExprMetaModel; } @Override - public boolean isJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public boolean isJmlSetComprehensionExpr() { return true; } @Override - public JmlSetComprehensionExpr asJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public JmlSetComprehensionExpr asJmlSetComprehensionExpr() { return this; } @Override - public Optional toJmlSetComprehensionExpr() { + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public Optional toJmlSetComprehensionExpr() { return Optional.of(this); } - public void ifJmlSetComprehensionExpr(Consumer action) { + @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") + public void ifJmlSetComprehensionExpr(Consumer action) { action.accept(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java index 50c94f3f89..84a4245d6e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java @@ -20,12 +20,12 @@ * @author Alexander Weigl * @version 1 (12/29/21) */ -public class JmlTypeExpr extends Expression { +public class JmlTypeExpr extends Expression { private Type type; @AllFieldsConstructor - public JmlTypeExpr(Type type) { + public JmlTypeExpr(Type type) { this(type.getTokenRange().orElseGet(null), type); } @@ -33,7 +33,7 @@ public JmlTypeExpr(Type type) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlTypeExpr(TokenRange tokenRange, Type type) { + public JmlTypeExpr(TokenRange tokenRange, Type type) { super(tokenRange); setType(type); customInitialization(); @@ -41,23 +41,23 @@ public JmlTypeExpr(TokenRange tokenRange, Type type) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlTypeExpr setType(final Type type) { + public JmlTypeExpr setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; @@ -72,31 +72,31 @@ public JmlTypeExpr setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlTypeExpr() { + public boolean isJmlTypeExpr() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlTypeExpr asJmlTypeExpr() { + public JmlTypeExpr asJmlTypeExpr() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlTypeExpr() { + public Optional toJmlTypeExpr() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlTypeExpr(Consumer action) { + public void ifJmlTypeExpr(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -109,13 +109,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlTypeExpr clone() { + public JmlTypeExpr clone() { return (JmlTypeExpr) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlTypeExprMetaModel getMetaModel() { + public JmlTypeExprMetaModel getMetaModel() { return JavaParserMetaModel.jmlTypeExprMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java index 9ea0ebb261..0766fdca7f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java @@ -21,60 +21,60 @@ * @author Alexander Weigl * @version 1 (06.03.22) */ -public class JmlBeginStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlBeginStmt extends JmlStatement implements NodeWithJmlTags { private NodeList jmlTags; @AllFieldsConstructor - public JmlBeginStmt(NodeList jmlTags) { + public JmlBeginStmt(NodeList jmlTags) { this(null, jmlTags); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBeginStmt() { + public boolean isJmlBeginStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlBeginStmt asJmlBeginStmt() { + public JmlBeginStmt asJmlBeginStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBeginStmt() { + public Optional toJmlBeginStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBeginStmt(Consumer action) { + public void ifJmlBeginStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlBeginStmt clone() { + public JmlBeginStmt clone() { return (JmlBeginStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlBeginStmtMetaModel getMetaModel() { + public JmlBeginStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlBeginStmtMetaModel; } @@ -82,19 +82,19 @@ public JmlBeginStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlBeginStmt(TokenRange tokenRange, NodeList jmlTags) { + public JmlBeginStmt(TokenRange tokenRange, NodeList jmlTags) { super(tokenRange); setJmlTags(jmlTags); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlBeginStmt setJmlTags(final NodeList jmlTags) { + public JmlBeginStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -109,7 +109,7 @@ public JmlBeginStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -124,7 +124,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java index 52b958144b..12b6537ce8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java @@ -21,60 +21,60 @@ * @author Alexander Weigl * @version 1 (06.03.22) */ -public class JmlEndStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlEndStmt extends JmlStatement implements NodeWithJmlTags { private NodeList jmlTags; @AllFieldsConstructor - public JmlEndStmt(NodeList jmlTags) { + public JmlEndStmt(NodeList jmlTags) { this(null, jmlTags); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlEndStmt() { + public boolean isJmlEndStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlEndStmt asJmlEndStmt() { + public JmlEndStmt asJmlEndStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlEndStmt() { + public Optional toJmlEndStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlEndStmt(Consumer action) { + public void ifJmlEndStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlEndStmt clone() { + public JmlEndStmt clone() { return (JmlEndStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlEndStmtMetaModel getMetaModel() { + public JmlEndStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlEndStmtMetaModel; } @@ -82,19 +82,19 @@ public JmlEndStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlEndStmt(TokenRange tokenRange, NodeList jmlTags) { + public JmlEndStmt(TokenRange tokenRange, NodeList jmlTags) { super(tokenRange); setJmlTags(jmlTags); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlEndStmt setJmlTags(final NodeList jmlTags) { + public JmlEndStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -109,7 +109,7 @@ public JmlEndStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -124,7 +124,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java index bd61ec67b0..c86b18bde7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java @@ -25,9 +25,9 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlExpressionStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlExpressionStmt extends JmlStatement implements NodeWithJmlTags { - public enum JmlStmtKind implements JmlKeyword { + public enum JmlStmtKind implements JmlKeyword { ASSERT(GeneratedJavaParserConstants.ASSERT), ASSERT_REDUNDANTLY(GeneratedJavaParserConstants.ASSERT_REDUNDANTLY), @@ -44,7 +44,7 @@ public enum JmlStmtKind implements JmlKeyword { } @Override - public String jmlSymbol() { + public String jmlSymbol() { return name().toLowerCase(); } } @@ -56,11 +56,11 @@ public String jmlSymbol() { private NodeList jmlTags; @AllFieldsConstructor - public JmlExpressionStmt(NodeList jmlTags, final JmlStmtKind kind, final Expression expression) { + public JmlExpressionStmt(NodeList jmlTags, final JmlStmtKind kind, final Expression expression) { this(null, jmlTags, kind, expression); } - public JmlExpressionStmt(TokenRange range, NodeList jmlTags, final Expression expression) { + public JmlExpressionStmt(TokenRange range, NodeList jmlTags, final Expression expression) { this(range, jmlTags, JmlStmtKind.ASSERT, expression); int tt = range.getBegin().getKind(); Optional k = Arrays.stream(JmlStmtKind.values()).filter(i -> i.tokenType == tt).findFirst(); @@ -72,43 +72,43 @@ public JmlExpressionStmt(TokenRange range, NodeList jmlTags, final E @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlAssertStmt() { + public boolean isJmlAssertStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlAssertStmt() { + public JmlExpressionStmt asJmlAssertStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlAssertStmt() { + public Optional toJmlAssertStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlAssertStmt(Consumer action) { + public void ifJmlAssertStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -127,13 +127,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlExpressionStmt clone() { + public JmlExpressionStmt clone() { return (JmlExpressionStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlExpressionStmtMetaModel getMetaModel() { + public JmlExpressionStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlExpressionStmtMetaModel; } @@ -141,18 +141,18 @@ public JmlExpressionStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlExpressionStmt(TokenRange tokenRange) { + public JmlExpressionStmt(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlExpressionStmt setExpression(final Expression expression) { + public JmlExpressionStmt setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; @@ -169,7 +169,7 @@ public JmlExpressionStmt setExpression(final Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlExpressionStmt(TokenRange tokenRange, NodeList jmlTags, JmlStmtKind kind, Expression expression) { + public JmlExpressionStmt(TokenRange tokenRange, NodeList jmlTags, JmlStmtKind kind, Expression expression) { super(tokenRange); setJmlTags(jmlTags); setKind(kind); @@ -179,35 +179,35 @@ public JmlExpressionStmt(TokenRange tokenRange, NodeList jmlTags, Jm @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlStmtWithExpression() { + public boolean isJmlStmtWithExpression() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlStmtWithExpression() { + public JmlExpressionStmt asJmlStmtWithExpression() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlStmtWithExpression() { + public Optional toJmlStmtWithExpression() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlStmtWithExpression(Consumer action) { + public void ifJmlStmtWithExpression(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlStmtKind getKind() { + public JmlStmtKind getKind() { return kind; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlExpressionStmt setKind(final JmlStmtKind kind) { + public JmlExpressionStmt setKind(final JmlStmtKind kind) { assertNotNull(kind); if (kind == this.kind) { return this; @@ -219,35 +219,35 @@ public JmlExpressionStmt setKind(final JmlStmtKind kind) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlExpressionStmt() { + public boolean isJmlExpressionStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlExpressionStmt() { + public JmlExpressionStmt asJmlExpressionStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlExpressionStmt() { + public Optional toJmlExpressionStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlExpressionStmt(Consumer action) { + public void ifJmlExpressionStmt(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlExpressionStmt setJmlTags(final NodeList jmlTags) { + public JmlExpressionStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -262,7 +262,7 @@ public JmlExpressionStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java index d7031d28af..fc21d3ee6a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java @@ -12,24 +12,24 @@ import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; -import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.JmlGhostStmtMetaModel; import java.util.Optional; import java.util.function.Consumer; import static com.github.javaparser.utils.Utils.assertNotNull; +import com.github.javaparser.metamodel.JavaParserMetaModel; /** * @author Alexander Weigl * @version 1 (3/26/21) */ -public class JmlGhostStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlGhostStmt extends JmlStatement implements NodeWithJmlTags { private Statement statement; private NodeList jmlTags; @AllFieldsConstructor - public JmlGhostStmt(NodeList jmlTags, Statement statement) { + public JmlGhostStmt(NodeList jmlTags, Statement statement) { this(null, jmlTags, statement); } @@ -37,7 +37,7 @@ public JmlGhostStmt(NodeList jmlTags, Statement statement) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlGhostStmt(TokenRange tokenRange, NodeList jmlTags, Statement statement) { + public JmlGhostStmt(TokenRange tokenRange, NodeList jmlTags, Statement statement) { super(tokenRange); setJmlTags(jmlTags); setStatement(statement); @@ -46,23 +46,23 @@ public JmlGhostStmt(TokenRange tokenRange, NodeList jmlTags, Stateme @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getStatement() { + public Statement getStatement() { return statement; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlGhostStmt setstatement(final Statement statement) { + public JmlGhostStmt setstatement(final Statement statement) { assertNotNull(statement); if (statement == this.statement) { return this; @@ -77,7 +77,7 @@ public JmlGhostStmt setstatement(final Statement statement) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -96,36 +96,36 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlGhostStmt clone() { + public JmlGhostStmt clone() { return (JmlGhostStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlGhostStatement() { + public boolean isJmlGhostStatement() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlGhostStmt asJmlGhostStatement() { + public JmlGhostStmt asJmlGhostStatement() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlGhostStatement() { + public Optional toJmlGhostStatement() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlGhostStatement(Consumer action) { + public void ifJmlGhostStatement(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlGhostStmt setStatement(final Statement statement) { + public JmlGhostStmt setStatement(final Statement statement) { assertNotNull(statement); if (statement == this.statement) { return this; @@ -140,41 +140,41 @@ public JmlGhostStmt setStatement(final Statement statement) { @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlGhostStmtMetaModel getMetaModel() { + public JmlGhostStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlGhostStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlGhostStmt() { + public boolean isJmlGhostStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlGhostStmt asJmlGhostStmt() { + public JmlGhostStmt asJmlGhostStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlGhostStmt() { + public Optional toJmlGhostStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlGhostStmt(Consumer action) { + public void ifJmlGhostStmt(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlGhostStmt setJmlTags(final NodeList jmlTags) { + public JmlGhostStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -189,7 +189,7 @@ public JmlGhostStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java index df1538e18c..18da1051b4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java @@ -21,60 +21,60 @@ * @author Alexander Weigl * @version 1 (06.03.22) */ -public class JmlLabelStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlLabelStmt extends JmlStatement implements NodeWithJmlTags { private SimpleName label; private NodeList jmlTags; @AllFieldsConstructor - public JmlLabelStmt(NodeList jmlTags, SimpleName label) { + public JmlLabelStmt(NodeList jmlTags, SimpleName label) { this(null, jmlTags, label); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabelStmt() { + public boolean isJmlLabelStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelStmt asJmlLabelStmt() { + public JmlLabelStmt asJmlLabelStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabelStmt() { + public Optional toJmlLabelStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabelStmt(Consumer action) { + public void ifJmlLabelStmt(Consumer action) { action.accept(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getLabel() { + public SimpleName getLabel() { return label; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLabelStmt setLabel(final SimpleName label) { + public JmlLabelStmt setLabel(final SimpleName label) { assertNotNull(label); if (label == this.label) { return this; @@ -89,7 +89,7 @@ public JmlLabelStmt setLabel(final SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -108,13 +108,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlLabelStmt clone() { + public JmlLabelStmt clone() { return (JmlLabelStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlLabelStmtMetaModel getMetaModel() { + public JmlLabelStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlLabelStmtMetaModel; } @@ -122,7 +122,7 @@ public JmlLabelStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlLabelStmt(TokenRange tokenRange, NodeList jmlTags, SimpleName label) { + public JmlLabelStmt(TokenRange tokenRange, NodeList jmlTags, SimpleName label) { super(tokenRange); setJmlTags(jmlTags); setLabel(label); @@ -130,12 +130,12 @@ public JmlLabelStmt(TokenRange tokenRange, NodeList jmlTags, SimpleN } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlLabelStmt setJmlTags(final NodeList jmlTags) { + public JmlLabelStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -150,7 +150,7 @@ public JmlLabelStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java index c24eed4be2..9cb825c500 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java @@ -21,60 +21,60 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlRefiningStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlRefiningStmt extends JmlStatement implements NodeWithJmlTags { private NodeList jmlTags; @AllFieldsConstructor - public JmlRefiningStmt(NodeList jmlTags) { + public JmlRefiningStmt(NodeList jmlTags) { this(null, jmlTags); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlRefiningStmt() { + public boolean isJmlRefiningStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlRefiningStmt asJmlRefiningStmt() { + public JmlRefiningStmt asJmlRefiningStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlRefiningStmt() { + public Optional toJmlRefiningStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlRefiningStmt(Consumer action) { + public void ifJmlRefiningStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlRefiningStmt clone() { + public JmlRefiningStmt clone() { return (JmlRefiningStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlRefiningStmtMetaModel getMetaModel() { + public JmlRefiningStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlRefiningStmtMetaModel; } @@ -82,19 +82,19 @@ public JmlRefiningStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlRefiningStmt(TokenRange tokenRange, NodeList jmlTags) { + public JmlRefiningStmt(TokenRange tokenRange, NodeList jmlTags) { super(tokenRange); setJmlTags(jmlTags); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlRefiningStmt setJmlTags(final NodeList jmlTags) { + public JmlRefiningStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -109,7 +109,7 @@ public JmlRefiningStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -124,7 +124,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java index 88ded9d08f..6ee095182f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java @@ -19,51 +19,51 @@ public abstract class JmlStatement extends Statement implements Jmlish { @AllFieldsConstructor - public JmlStatement() { + public JmlStatement() { } /** * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlStatement(TokenRange tokenRange) { + public JmlStatement(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlStatement() { + public boolean isJmlStatement() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlStatement asJmlStatement() { + public JmlStatement asJmlStatement() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlStatement() { + public Optional toJmlStatement() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlStatement(Consumer action) { + public void ifJmlStatement(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlStatement clone() { + public JmlStatement clone() { return (JmlStatement) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlStatementMetaModel getMetaModel() { + public JmlStatementMetaModel getMetaModel() { return JavaParserMetaModel.jmlStatementMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java index b931cddbde..61839763f3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java @@ -21,54 +21,54 @@ * @author Alexander Weigl * @version 1 (2/21/21) */ -public class JmlUnreachableStmt extends JmlStatement implements NodeWithJmlTags { +public class JmlUnreachableStmt extends JmlStatement implements NodeWithJmlTags { private NodeList jmlTags; @AllFieldsConstructor - public JmlUnreachableStmt(NodeList jmlTags) { + public JmlUnreachableStmt(NodeList jmlTags) { this(null, jmlTags); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnreachableStmt() { + public boolean isUnreachableStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlUnreachableStmt asUnreachableStmt() { + public JmlUnreachableStmt asUnreachableStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnreachableStmt() { + public Optional toUnreachableStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnreachableStmt(Consumer action) { + public void ifUnreachableStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public JmlUnreachableStmt clone() { + public JmlUnreachableStmt clone() { return (JmlUnreachableStmt) accept(new CloneVisitor(), null); } @@ -76,7 +76,7 @@ public JmlUnreachableStmt clone() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public JmlUnreachableStmt(TokenRange tokenRange, NodeList jmlTags) { + public JmlUnreachableStmt(TokenRange tokenRange, NodeList jmlTags) { super(tokenRange); setJmlTags(jmlTags); customInitialization(); @@ -84,41 +84,41 @@ public JmlUnreachableStmt(TokenRange tokenRange, NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlUnreachableStmt() { + public boolean isJmlUnreachableStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlUnreachableStmt asJmlUnreachableStmt() { + public JmlUnreachableStmt asJmlUnreachableStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlUnreachableStmt() { + public Optional toJmlUnreachableStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlUnreachableStmt(Consumer action) { + public void ifJmlUnreachableStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public JmlUnreachableStmtMetaModel getMetaModel() { + public JmlUnreachableStmtMetaModel getMetaModel() { return JavaParserMetaModel.jmlUnreachableStmtMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getJmlTags() { + public NodeList getJmlTags() { return jmlTags; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public JmlUnreachableStmt setJmlTags(final NodeList jmlTags) { + public JmlUnreachableStmt setJmlTags(final NodeList jmlTags) { assertNotNull(jmlTags); if (jmlTags == this.jmlTags) { return this; @@ -133,7 +133,7 @@ public JmlUnreachableStmt setJmlTags(final NodeList jmlTags) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -148,7 +148,7 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java index 967f20e6b4..dbf1155336 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java @@ -35,15 +35,15 @@ /** * A primitive type in JML. */ -public class JmlLogicType extends Type implements Jmlish { +public class JmlLogicType extends Type implements Jmlish { - public enum Primitive implements JmlKeyword { + public enum Primitive implements JmlKeyword { SET("\\set"), SEQ("\\seq"), MAP("\\map"), BIGINT("\\bigint"), BIGFLOAT("\\bigfloat"); final String symbol; - public String jmlSymbol() { + public String jmlSymbol() { return symbol; } @@ -54,53 +54,53 @@ public String jmlSymbol() { private final Primitive type; - public JmlLogicType() { + public JmlLogicType() { this(null, Primitive.BIGINT); } @AllFieldsConstructor - public JmlLogicType(Primitive type) { + public JmlLogicType(Primitive type) { this(null, type); } - public JmlLogicType(TokenRange range, final Primitive type) { + public JmlLogicType(TokenRange range, final Primitive type) { super(range); this.type = type; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return null; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Primitive getType() { + public Primitive getType() { return type; } @Override - public String toDescriptor() { + public String toDescriptor() { return type.symbol; } @Override - public String asString() { + public String asString() { return toDescriptor(); } @Override - public ResolvedPrimitiveType resolve() { + public ResolvedPrimitiveType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedPrimitiveType.class); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { return resolve(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java index e3a136d0e6..8d95fe9c88 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseModuleDirective; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -42,8 +41,7 @@ /** * A Java 9 Jigsaw module declaration. {@code @Foo module com.github.abc { requires a.B; }} */ -public class ModuleDeclaration extends Node - implements NodeWithName, NodeWithAnnotations { +public class ModuleDeclaration extends Node implements NodeWithName, NodeWithAnnotations { private Name name; @@ -53,17 +51,16 @@ public class ModuleDeclaration extends Node private NodeList directives; - public ModuleDeclaration() { + public ModuleDeclaration() { this(null, new NodeList<>(), new Name(), false, new NodeList<>()); } - public ModuleDeclaration(Name name, boolean isOpen) { + public ModuleDeclaration(Name name, boolean isOpen) { this(null, new NodeList<>(), name, isOpen, new NodeList<>()); } @AllFieldsConstructor - public ModuleDeclaration( - NodeList annotations, Name name, boolean isOpen, NodeList directives) { + public ModuleDeclaration(NodeList annotations, Name name, boolean isOpen, NodeList directives) { this(null, annotations, name, isOpen, directives); } @@ -71,12 +68,7 @@ public ModuleDeclaration( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleDeclaration( - TokenRange tokenRange, - NodeList annotations, - Name name, - boolean isOpen, - NodeList directives) { + public ModuleDeclaration(TokenRange tokenRange, NodeList annotations, Name name, boolean isOpen, NodeList directives) { super(tokenRange); setAnnotations(annotations); setName(name); @@ -87,47 +79,49 @@ public ModuleDeclaration( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleDeclaration setName(final Name name) { + public ModuleDeclaration setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleDeclaration setAnnotations(final NodeList annotations) { + public ModuleDeclaration setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; @@ -135,7 +129,7 @@ public ModuleDeclaration setAnnotations(final NodeList annotatio @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -155,12 +149,12 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isOpen() { + public boolean isOpen() { return isOpen; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleDeclaration setOpen(final boolean isOpen) { + public ModuleDeclaration setOpen(final boolean isOpen) { if (isOpen == this.isOpen) { return this; } @@ -170,18 +164,19 @@ public ModuleDeclaration setOpen(final boolean isOpen) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getDirectives() { + public NodeList getDirectives() { return directives; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleDeclaration setDirectives(final NodeList directives) { + public ModuleDeclaration setDirectives(final NodeList directives) { assertNotNull(directives); if (directives == this.directives) { return this; } notifyPropertyChange(ObservableProperty.DIRECTIVES, this.directives, directives); - if (this.directives != null) this.directives.setParentNode(null); + if (this.directives != null) + this.directives.setParentNode(null); this.directives = directives; setAsParentNodeOf(directives); return this; @@ -189,19 +184,19 @@ public ModuleDeclaration setDirectives(final NodeList directive @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleDeclaration clone() { + public ModuleDeclaration clone() { return (ModuleDeclaration) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleDeclarationMetaModel getMetaModel() { + public ModuleDeclarationMetaModel getMetaModel() { return JavaParserMetaModel.moduleDeclarationMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -227,11 +222,11 @@ public boolean replace(Node node, Node replacementNode) { /** * Add a directive to the module, like "exports R.S to T1.U1, T2.U2;" */ - public ModuleDeclaration addDirective(String directive) { + public ModuleDeclaration addDirective(String directive) { return addDirective(parseModuleDirective(directive)); } - public ModuleDeclaration addDirective(ModuleDirective directive) { + public ModuleDeclaration addDirective(ModuleDirective directive) { getDirectives().add(directive); return this; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java index d49cf2f66c..f09a697a75 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.modules; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -38,7 +37,7 @@ public abstract class ModuleDirective extends Node { @AllFieldsConstructor - public ModuleDirective() { + public ModuleDirective() { this(null); } @@ -46,209 +45,210 @@ public ModuleDirective() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleDirective(TokenRange tokenRange) { + public ModuleDirective(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleDirective clone() { + public ModuleDirective clone() { return (ModuleDirective) accept(new CloneVisitor(), null); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleExportsStmt() { + public boolean isModuleExportsStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleExportsDirective asModuleExportsStmt() { + public ModuleExportsDirective asModuleExportsStmt() { throw new IllegalStateException(f("%s is not an ModuleExportsDirective", this)); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleOpensStmt() { + public boolean isModuleOpensStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleOpensDirective asModuleOpensStmt() { + public ModuleOpensDirective asModuleOpensStmt() { throw new IllegalStateException(f("%s is not an ModuleOpensDirective", this)); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleProvidesStmt() { + public boolean isModuleProvidesStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleProvidesDirective asModuleProvidesStmt() { + public ModuleProvidesDirective asModuleProvidesStmt() { throw new IllegalStateException(f("%s is not an ModuleProvidesDirective", this)); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleRequiresStmt() { + public boolean isModuleRequiresStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleRequiresDirective asModuleRequiresStmt() { + public ModuleRequiresDirective asModuleRequiresStmt() { throw new IllegalStateException(f("%s is not an ModuleRequiresDirective", this)); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleUsesStmt() { + public boolean isModuleUsesStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleUsesDirective asModuleUsesStmt() { + public ModuleUsesDirective asModuleUsesStmt() { throw new IllegalStateException(f("%s is not an ModuleUsesDirective", this)); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleExportsStmt(Consumer action) {} + public void ifModuleExportsStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleOpensStmt(Consumer action) {} + public void ifModuleOpensStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleProvidesStmt(Consumer action) {} + public void ifModuleProvidesStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleRequiresStmt(Consumer action) {} + public void ifModuleRequiresStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleUsesStmt(Consumer action) {} + public void ifModuleUsesStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleExportsStmt() { + public Optional toModuleExportsStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleOpensStmt() { + public Optional toModuleOpensStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleProvidesStmt() { + public Optional toModuleProvidesStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleRequiresStmt() { + public Optional toModuleRequiresStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleUsesStmt() { + public Optional toModuleUsesStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleExportsDirective() { + public boolean isModuleExportsDirective() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleExportsDirective asModuleExportsDirective() { - throw new IllegalStateException(f( - "%s is not ModuleExportsDirective, it is %s", - this, this.getClass().getSimpleName())); + public ModuleExportsDirective asModuleExportsDirective() { + throw new IllegalStateException(f("%s is not ModuleExportsDirective, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleExportsDirective() { + public Optional toModuleExportsDirective() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleExportsDirective(Consumer action) {} + public void ifModuleExportsDirective(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleOpensDirective() { + public boolean isModuleOpensDirective() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleOpensDirective asModuleOpensDirective() { - throw new IllegalStateException(f( - "%s is not ModuleOpensDirective, it is %s", - this, this.getClass().getSimpleName())); + public ModuleOpensDirective asModuleOpensDirective() { + throw new IllegalStateException(f("%s is not ModuleOpensDirective, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleOpensDirective() { + public Optional toModuleOpensDirective() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleOpensDirective(Consumer action) {} + public void ifModuleOpensDirective(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleProvidesDirective() { + public boolean isModuleProvidesDirective() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleProvidesDirective asModuleProvidesDirective() { - throw new IllegalStateException(f( - "%s is not ModuleProvidesDirective, it is %s", - this, this.getClass().getSimpleName())); + public ModuleProvidesDirective asModuleProvidesDirective() { + throw new IllegalStateException(f("%s is not ModuleProvidesDirective, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleProvidesDirective() { + public Optional toModuleProvidesDirective() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleProvidesDirective(Consumer action) {} + public void ifModuleProvidesDirective(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleRequiresDirective() { + public boolean isModuleRequiresDirective() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleRequiresDirective asModuleRequiresDirective() { - throw new IllegalStateException(f( - "%s is not ModuleRequiresDirective, it is %s", - this, this.getClass().getSimpleName())); + public ModuleRequiresDirective asModuleRequiresDirective() { + throw new IllegalStateException(f("%s is not ModuleRequiresDirective, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleRequiresDirective() { + public Optional toModuleRequiresDirective() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleRequiresDirective(Consumer action) {} + public void ifModuleRequiresDirective(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleUsesDirective() { + public boolean isModuleUsesDirective() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleUsesDirective asModuleUsesDirective() { - throw new IllegalStateException(f( - "%s is not ModuleUsesDirective, it is %s", this, this.getClass().getSimpleName())); + public ModuleUsesDirective asModuleUsesDirective() { + throw new IllegalStateException(f("%s is not ModuleUsesDirective, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleUsesDirective() { + public Optional toModuleUsesDirective() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleUsesDirective(Consumer action) {} + public void ifModuleUsesDirective(Consumer action) { + } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleDirectiveMetaModel getMetaModel() { + public ModuleDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java index 5396a52b12..12278732f9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseName; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -42,18 +41,18 @@ /** * An exports directive in module-info.java. {@code exports R.S to T1.U1, T2.U2;} */ -public class ModuleExportsDirective extends ModuleDirective implements NodeWithName { +public class ModuleExportsDirective extends ModuleDirective implements NodeWithName { private Name name; private NodeList moduleNames; - public ModuleExportsDirective() { + public ModuleExportsDirective() { this(null, new Name(), new NodeList<>()); } @AllFieldsConstructor - public ModuleExportsDirective(Name name, NodeList moduleNames) { + public ModuleExportsDirective(Name name, NodeList moduleNames) { this(null, name, moduleNames); } @@ -61,7 +60,7 @@ public ModuleExportsDirective(Name name, NodeList moduleNames) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleExportsDirective(TokenRange tokenRange, Name name, NodeList moduleNames) { + public ModuleExportsDirective(TokenRange tokenRange, Name name, NodeList moduleNames) { super(tokenRange); setName(name); setModuleNames(moduleNames); @@ -70,19 +69,19 @@ public ModuleExportsDirective(TokenRange tokenRange, Name name, NodeList m @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -96,36 +95,38 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleExportsDirective setName(final Name name) { + public ModuleExportsDirective setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModuleNames() { + public NodeList getModuleNames() { return moduleNames; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleExportsDirective setModuleNames(final NodeList moduleNames) { + public ModuleExportsDirective setModuleNames(final NodeList moduleNames) { assertNotNull(moduleNames); if (moduleNames == this.moduleNames) { return this; } notifyPropertyChange(ObservableProperty.MODULE_NAMES, this.moduleNames, moduleNames); - if (this.moduleNames != null) this.moduleNames.setParentNode(null); + if (this.moduleNames != null) + this.moduleNames.setParentNode(null); this.moduleNames = moduleNames; setAsParentNodeOf(moduleNames); return this; @@ -133,13 +134,13 @@ public ModuleExportsDirective setModuleNames(final NodeList moduleNames) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleExportsDirective clone() { + public ModuleExportsDirective clone() { return (ModuleExportsDirective) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -158,59 +159,59 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleExportsStmt() { + public boolean isModuleExportsStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleExportsDirective asModuleExportsStmt() { + public ModuleExportsDirective asModuleExportsStmt() { return this; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleExportsStmt(Consumer action) { + public void ifModuleExportsStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleExportsStmt() { + public Optional toModuleExportsStmt() { return Optional.of(this); } - public ModuleExportsDirective addModuleName(String name) { + public ModuleExportsDirective addModuleName(String name) { moduleNames.add(parseName(name)); return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleExportsDirective() { + public boolean isModuleExportsDirective() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleExportsDirective asModuleExportsDirective() { + public ModuleExportsDirective asModuleExportsDirective() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleExportsDirective() { + public Optional toModuleExportsDirective() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleExportsDirective(Consumer action) { + public void ifModuleExportsDirective(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleExportsDirectiveMetaModel getMetaModel() { + public ModuleExportsDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleExportsDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java index 15245f9521..55cd784fb7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.modules; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -41,18 +40,18 @@ /** * An opens directive in module-info.java. {@code opens R.S to T1.U1, T2.U2;} */ -public class ModuleOpensDirective extends ModuleDirective implements NodeWithName { +public class ModuleOpensDirective extends ModuleDirective implements NodeWithName { private Name name; private NodeList moduleNames; - public ModuleOpensDirective() { + public ModuleOpensDirective() { this(null, new Name(), new NodeList<>()); } @AllFieldsConstructor - public ModuleOpensDirective(Name name, NodeList moduleNames) { + public ModuleOpensDirective(Name name, NodeList moduleNames) { this(null, name, moduleNames); } @@ -60,7 +59,7 @@ public ModuleOpensDirective(Name name, NodeList moduleNames) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleOpensDirective(TokenRange tokenRange, Name name, NodeList moduleNames) { + public ModuleOpensDirective(TokenRange tokenRange, Name name, NodeList moduleNames) { super(tokenRange); setName(name); setModuleNames(moduleNames); @@ -69,19 +68,19 @@ public ModuleOpensDirective(TokenRange tokenRange, Name name, NodeList mod @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -95,36 +94,38 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleOpensDirective setName(final Name name) { + public ModuleOpensDirective setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModuleNames() { + public NodeList getModuleNames() { return moduleNames; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleOpensDirective setModuleNames(final NodeList moduleNames) { + public ModuleOpensDirective setModuleNames(final NodeList moduleNames) { assertNotNull(moduleNames); if (moduleNames == this.moduleNames) { return this; } notifyPropertyChange(ObservableProperty.MODULE_NAMES, this.moduleNames, moduleNames); - if (this.moduleNames != null) this.moduleNames.setParentNode(null); + if (this.moduleNames != null) + this.moduleNames.setParentNode(null); this.moduleNames = moduleNames; setAsParentNodeOf(moduleNames); return this; @@ -132,13 +133,13 @@ public ModuleOpensDirective setModuleNames(final NodeList moduleNames) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleOpensDirective clone() { + public ModuleOpensDirective clone() { return (ModuleOpensDirective) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -157,54 +158,54 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleOpensStmt() { + public boolean isModuleOpensStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleOpensDirective asModuleOpensStmt() { + public ModuleOpensDirective asModuleOpensStmt() { return this; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleOpensStmt(Consumer action) { + public void ifModuleOpensStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleOpensStmt() { + public Optional toModuleOpensStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleOpensDirective() { + public boolean isModuleOpensDirective() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleOpensDirective asModuleOpensDirective() { + public ModuleOpensDirective asModuleOpensDirective() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleOpensDirective() { + public Optional toModuleOpensDirective() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleOpensDirective(Consumer action) { + public void ifModuleOpensDirective(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleOpensDirectiveMetaModel getMetaModel() { + public ModuleOpensDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleOpensDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java index 5f72f6fb64..a5f6a744db 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.modules; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -41,18 +40,18 @@ /** * A provides directive in module-info.java. {@code provides X.Y with Z1.Z2, Z3.Z4;} */ -public class ModuleProvidesDirective extends ModuleDirective implements NodeWithName { +public class ModuleProvidesDirective extends ModuleDirective implements NodeWithName { private Name name; private NodeList with; - public ModuleProvidesDirective() { + public ModuleProvidesDirective() { this(null, new Name(), new NodeList<>()); } @AllFieldsConstructor - public ModuleProvidesDirective(Name name, NodeList with) { + public ModuleProvidesDirective(Name name, NodeList with) { this(null, name, with); } @@ -60,7 +59,7 @@ public ModuleProvidesDirective(Name name, NodeList with) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleProvidesDirective(TokenRange tokenRange, Name name, NodeList with) { + public ModuleProvidesDirective(TokenRange tokenRange, Name name, NodeList with) { super(tokenRange); setName(name); setWith(with); @@ -69,19 +68,19 @@ public ModuleProvidesDirective(TokenRange tokenRange, Name name, NodeList @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -96,72 +95,74 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleProvidesDirective clone() { + public ModuleProvidesDirective clone() { return (ModuleProvidesDirective) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleProvidesStmt() { + public boolean isModuleProvidesStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleProvidesDirective asModuleProvidesStmt() { + public ModuleProvidesDirective asModuleProvidesStmt() { return this; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleProvidesStmt(Consumer action) { + public void ifModuleProvidesStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleProvidesStmt() { + public Optional toModuleProvidesStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleProvidesDirective setName(final Name name) { + public ModuleProvidesDirective setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleProvidesDirective setWith(final NodeList with) { + public ModuleProvidesDirective setWith(final NodeList with) { assertNotNull(with); if (with == this.with) { return this; } notifyPropertyChange(ObservableProperty.WITH, this.with, with); - if (this.with != null) this.with.setParentNode(null); + if (this.with != null) + this.with.setParentNode(null); this.with = with; setAsParentNodeOf(with); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getWith() { + public NodeList getWith() { return with; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -180,31 +181,31 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleProvidesDirective() { + public boolean isModuleProvidesDirective() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleProvidesDirective asModuleProvidesDirective() { + public ModuleProvidesDirective asModuleProvidesDirective() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleProvidesDirective() { + public Optional toModuleProvidesDirective() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleProvidesDirective(Consumer action) { + public void ifModuleProvidesDirective(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleProvidesDirectiveMetaModel getMetaModel() { + public ModuleProvidesDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleProvidesDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java index 4a9219a70e..a871f760a5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java @@ -20,10 +20,9 @@ */ package com.github.javaparser.ast.modules; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; -import static com.github.javaparser.ast.Modifier.Keyword.TRANSITIVE; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.STATIC; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.TRANSITIVE; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.*; import com.github.javaparser.ast.expr.Name; @@ -41,19 +40,18 @@ /** * A require directive in module-info.java. {@code require a.b.C;} */ -public class ModuleRequiresDirective extends ModuleDirective - implements NodeWithStaticModifier, NodeWithName { +public class ModuleRequiresDirective extends ModuleDirective implements NodeWithStaticModifier, NodeWithName { private NodeList modifiers; private Name name; - public ModuleRequiresDirective() { + public ModuleRequiresDirective() { this(null, new NodeList<>(), new Name()); } @AllFieldsConstructor - public ModuleRequiresDirective(NodeList modifiers, Name name) { + public ModuleRequiresDirective(NodeList modifiers, Name name) { this(null, modifiers, name); } @@ -61,7 +59,7 @@ public ModuleRequiresDirective(NodeList modifiers, Name name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleRequiresDirective(TokenRange tokenRange, NodeList modifiers, Name name) { + public ModuleRequiresDirective(TokenRange tokenRange, NodeList modifiers, Name name) { super(tokenRange); setModifiers(modifiers); setName(name); @@ -70,47 +68,49 @@ public ModuleRequiresDirective(TokenRange tokenRange, NodeList modifie @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getModifiers() { + public NodeList getModifiers() { return modifiers; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleRequiresDirective setModifiers(final NodeList modifiers) { + public ModuleRequiresDirective setModifiers(final NodeList modifiers) { assertNotNull(modifiers); if (modifiers == this.modifiers) { return this; } notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers); - if (this.modifiers != null) this.modifiers.setParentNode(null); + if (this.modifiers != null) + this.modifiers.setParentNode(null); this.modifiers = modifiers; setAsParentNodeOf(modifiers); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleRequiresDirective setName(final Name name) { + public ModuleRequiresDirective setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -119,7 +119,7 @@ public ModuleRequiresDirective setName(final Name name) { /* * A requires static directive indicates that a module is required at compile time, but is optional at runtime. */ - public boolean isStatic() { + public boolean isStatic() { return hasModifier(STATIC); } @@ -127,17 +127,17 @@ public boolean isStatic() { * Requires transitive—implied readability. * To specify a dependency on another module and to ensure that other modules reading your module also read that dependency */ - public boolean isTransitive() { + public boolean isTransitive() { return hasModifier(TRANSITIVE); } - public ModuleRequiresDirective setTransitive(boolean set) { + public ModuleRequiresDirective setTransitive(boolean set) { return setModifier(TRANSITIVE, set); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -152,13 +152,13 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleRequiresDirective clone() { + public ModuleRequiresDirective clone() { return (ModuleRequiresDirective) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -177,54 +177,54 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleRequiresStmt() { + public boolean isModuleRequiresStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleRequiresDirective asModuleRequiresStmt() { + public ModuleRequiresDirective asModuleRequiresStmt() { return this; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleRequiresStmt(Consumer action) { + public void ifModuleRequiresStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleRequiresStmt() { + public Optional toModuleRequiresStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleRequiresDirective() { + public boolean isModuleRequiresDirective() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleRequiresDirective asModuleRequiresDirective() { + public ModuleRequiresDirective asModuleRequiresDirective() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleRequiresDirective() { + public Optional toModuleRequiresDirective() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleRequiresDirective(Consumer action) { + public void ifModuleRequiresDirective(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleRequiresDirectiveMetaModel getMetaModel() { + public ModuleRequiresDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleRequiresDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java index c25e59d59f..22280a17ad 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.modules; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -40,16 +39,16 @@ /** * A uses directive in module-info.java. {@code uses V.W;} */ -public class ModuleUsesDirective extends ModuleDirective implements NodeWithName { +public class ModuleUsesDirective extends ModuleDirective implements NodeWithName { private Name name; - public ModuleUsesDirective() { + public ModuleUsesDirective() { this(null, new Name()); } @AllFieldsConstructor - public ModuleUsesDirective(Name name) { + public ModuleUsesDirective(Name name) { this(null, name); } @@ -57,7 +56,7 @@ public ModuleUsesDirective(Name name) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ModuleUsesDirective(TokenRange tokenRange, Name name) { + public ModuleUsesDirective(TokenRange tokenRange, Name name) { super(tokenRange); setName(name); customInitialization(); @@ -65,24 +64,25 @@ public ModuleUsesDirective(TokenRange tokenRange, Name name) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleUsesDirective setType(final Name name) { + public ModuleUsesDirective setType(final Name name) { assertNotNull(name); if (name == this.name) { return (ModuleUsesDirective) this; } notifyPropertyChange(ObservableProperty.TYPE, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -90,46 +90,47 @@ public ModuleUsesDirective setType(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ModuleUsesDirective clone() { + public ModuleUsesDirective clone() { return (ModuleUsesDirective) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleUsesStmt() { + public boolean isModuleUsesStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleUsesDirective asModuleUsesStmt() { + public ModuleUsesDirective asModuleUsesStmt() { return this; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleUsesStmt(Consumer action) { + public void ifModuleUsesStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleUsesStmt() { + public Optional toModuleUsesStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Name getName() { + public Name getName() { return name; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ModuleUsesDirective setName(final Name name) { + public ModuleUsesDirective setName(final Name name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -137,7 +138,7 @@ public ModuleUsesDirective setName(final Name name) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -150,31 +151,31 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isModuleUsesDirective() { + public boolean isModuleUsesDirective() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ModuleUsesDirective asModuleUsesDirective() { + public ModuleUsesDirective asModuleUsesDirective() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toModuleUsesDirective() { + public Optional toModuleUsesDirective() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifModuleUsesDirective(Consumer action) { + public void ifModuleUsesDirective(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ModuleUsesDirectiveMetaModel getMetaModel() { + public ModuleUsesDirectiveMetaModel getMetaModel() { return JavaParserMetaModel.moduleUsesDirectiveMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java index d5dce74f03..b1299f78bf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseExpression; import static com.github.javaparser.StaticJavaParser.parseName; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.*; @@ -35,7 +34,7 @@ * @author Federico Tomassetti * @since July 2014 */ -public interface NodeWithAnnotations { +public interface NodeWithAnnotations { NodeList getAnnotations(); @@ -140,8 +139,7 @@ default N addMarkerAnnotation(Class clazz) { */ @SuppressWarnings("unchecked") default N addSingleMemberAnnotation(String name, Expression expression) { - SingleMemberAnnotationExpr singleMemberAnnotationExpr = - new SingleMemberAnnotationExpr(parseName(name), expression); + SingleMemberAnnotationExpr singleMemberAnnotationExpr = new SingleMemberAnnotationExpr(parseName(name), expression); return addAnnotation(singleMemberAnnotationExpr); } @@ -187,8 +185,7 @@ default N addSingleMemberAnnotation(Class clazz, String va * @return true if found, false if not */ default boolean isAnnotationPresent(String annotationName) { - return getAnnotations().stream() - .anyMatch(a -> a.getName().getIdentifier().equals(annotationName)); + return getAnnotations().stream().anyMatch(a -> a.getName().getIdentifier().equals(annotationName)); } /** @@ -207,9 +204,7 @@ default boolean isAnnotationPresent(Class annotationClass) * @param annotationName the name of the annotation */ default Optional getAnnotationByName(String annotationName) { - return getAnnotations().stream() - .filter(a -> a.getName().getIdentifier().equals(annotationName)) - .findFirst(); + return getAnnotations().stream().filter(a -> a.getName().getIdentifier().equals(annotationName)).findFirst(); } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java index a30ad253c1..d9556e8974 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseExpression; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.Expression; @@ -30,7 +29,7 @@ /** * A node with arguments. */ -public interface NodeWithArguments { +public interface NodeWithArguments { N setArguments(NodeList arguments); @@ -76,7 +75,8 @@ default int getArgumentPosition(Expression argument, Function { +public interface NodeWithBlockStmt { BlockStmt getBody(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBody.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBody.java index 35e0674e84..5f5767de9e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBody.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBody.java @@ -25,7 +25,7 @@ import com.github.javaparser.ast.stmt.EmptyStmt; import com.github.javaparser.ast.stmt.Statement; -public interface NodeWithBody { +public interface NodeWithBody { Statement getBody(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithCondition.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithCondition.java index 0eca375e85..6b476b300b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithCondition.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithCondition.java @@ -23,7 +23,7 @@ import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Expression; -public interface NodeWithCondition { +public interface NodeWithCondition { Expression getCondition(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java index c6371f01d0..c05b380c60 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java @@ -26,7 +26,7 @@ * @author Federico Tomassetti * @since July 2014 */ -public interface NodeWithDeclaration { +public interface NodeWithDeclaration { /** * As {@link NodeWithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java index a8b12aa809..fdd73c1dfe 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java @@ -21,14 +21,13 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseExpression; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Expression; /** * A node that has an expression in it. */ -public interface NodeWithExpression { +public interface NodeWithExpression { Expression getExpression(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java index 1954259d9a..b0cd2bf750 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.ClassOrInterfaceType; @@ -29,7 +28,7 @@ /** * A node that explicitly extends other types, using the {@code extends} keyword. */ -public interface NodeWithExtends { +public interface NodeWithExtends { /** * @return All extended types that have been explicitly added (thus exist within the AST). diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java index 53ac1d00bb..fd186ddc82 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java @@ -21,10 +21,9 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.ast.Node; -public interface NodeWithIdentifier { +public interface NodeWithIdentifier { String getIdentifier(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java index 4ef4587144..d631e62765 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.ClassOrInterfaceType; @@ -29,7 +28,7 @@ /** * A node that implements other types. */ -public interface NodeWithImplements { +public interface NodeWithImplements { NodeList getImplementedTypes(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java index 7c8014cd92..83aceef166 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java @@ -29,7 +29,7 @@ /** * A node that can be documented with a Javadoc comment. */ -public interface NodeWithJavadoc { +public interface NodeWithJavadoc { Optional getComment(); @@ -42,8 +42,7 @@ public interface NodeWithJavadoc { * @return The JavadocComment for this node wrapped in an optional as it may be absent. */ default Optional getJavadocComment() { - return getComment().filter(comment -> comment instanceof JavadocComment).map(comment -> - (JavadocComment) comment); + return getComment().filter(comment -> comment instanceof JavadocComment).map(comment -> (JavadocComment) comment); } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java index 9fea050387..ce157e8eca 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java @@ -22,11 +22,10 @@ import static com.github.javaparser.StaticJavaParser.parseType; import static com.github.javaparser.ast.Modifier.Keyword; -import static com.github.javaparser.ast.Modifier.Keyword.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.ast.Modifier.createModifierList; import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList; - import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; @@ -44,7 +43,7 @@ * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getMembers * method. */ -public interface NodeWithMembers extends NodeWithSimpleName { +public interface NodeWithMembers extends NodeWithSimpleName { /** * @return all members inside the braces of this node, @@ -77,10 +76,10 @@ default N addMember(BodyDeclaration member) { * * @param typeClass the type of the field * @param name the name of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addField(Class typeClass, String name, Modifier.Keyword... modifiers) { + default FieldDeclaration addField(Class typeClass, String name, Modifier.DefaultKeyword... modifiers) { tryAddImportToParentCompilationUnit(typeClass); return addField(typeClass.getSimpleName(), name, modifiers); } @@ -90,10 +89,10 @@ default FieldDeclaration addField(Class typeClass, String name, Modifier.Keyw * * @param type the type of the field * @param name the name of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addField(String type, String name, Modifier.Keyword... modifiers) { + default FieldDeclaration addField(String type, String name, Modifier.DefaultKeyword... modifiers) { return addField(parseType(type), name, modifiers); } @@ -102,10 +101,10 @@ default FieldDeclaration addField(String type, String name, Modifier.Keyword... * * @param type the type of the field * @param name the name of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addField(Type type, String name, Modifier.Keyword... modifiers) { + default FieldDeclaration addField(Type type, String name, Modifier.DefaultKeyword... modifiers) { FieldDeclaration fieldDeclaration = new FieldDeclaration(); VariableDeclarator variable = new VariableDeclarator(type, name); fieldDeclaration.getVariables().add(variable); @@ -120,11 +119,10 @@ default FieldDeclaration addField(Type type, String name, Modifier.Keyword... mo * @param typeClass the type of the field * @param name the name of the field * @param initializer the initializer of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addFieldWithInitializer( - Class typeClass, String name, Expression initializer, Modifier.Keyword... modifiers) { + default FieldDeclaration addFieldWithInitializer(Class typeClass, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) { tryAddImportToParentCompilationUnit(typeClass); return addFieldWithInitializer(typeClass.getSimpleName(), name, initializer, modifiers); } @@ -135,11 +133,10 @@ default FieldDeclaration addFieldWithInitializer( * @param type the type of the field * @param name the name of the field * @param initializer the initializer of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addFieldWithInitializer( - String type, String name, Expression initializer, Modifier.Keyword... modifiers) { + default FieldDeclaration addFieldWithInitializer(String type, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) { return addFieldWithInitializer(parseType(type), name, initializer, modifiers); } @@ -149,11 +146,10 @@ default FieldDeclaration addFieldWithInitializer( * @param type the type of the field * @param name the name of the field * @param initializer the initializer of the field - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link FieldDeclaration} created */ - default FieldDeclaration addFieldWithInitializer( - Type type, String name, Expression initializer, Modifier.Keyword... modifiers) { + default FieldDeclaration addFieldWithInitializer(Type type, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) { FieldDeclaration declaration = addField(type, name, modifiers); declaration.getVariables().iterator().next().setInitializer(initializer); return declaration; @@ -265,7 +261,7 @@ default FieldDeclaration addProtectedField(Type type, String name) { * Adds a methods with void return by default to this. * * @param methodName the method name - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the {@link MethodDeclaration} created */ default MethodDeclaration addMethod(String methodName, Keyword... modifiers) { @@ -280,10 +276,10 @@ default MethodDeclaration addMethod(String methodName, Keyword... modifiers) { /** * Adds a constructor to this node with members. * - * @param modifiers the modifiers like {@link Modifier.Keyword#PUBLIC} + * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC} * @return the created constructor */ - default ConstructorDeclaration addConstructor(Modifier.Keyword... modifiers) { + default ConstructorDeclaration addConstructor(Modifier.DefaultKeyword... modifiers) { ConstructorDeclaration constructorDeclaration = new ConstructorDeclaration(); constructorDeclaration.setModifiers(createModifierList(modifiers)); constructorDeclaration.setName(getName()); @@ -318,9 +314,7 @@ default BlockStmt addStaticInitializer() { * @return the methods found (multiple in case of overloading) */ default List getMethodsByName(String name) { - return unmodifiableList(getMethods().stream() - .filter(m -> m.getNameAsString().equals(name)) - .collect(toList())); + return unmodifiableList(getMethods().stream().filter(m -> m.getNameAsString().equals(name)).collect(toList())); } /** @@ -329,10 +323,7 @@ default List getMethodsByName(String name) { * @return the methods found. This list is immutable. */ default List getMethods() { - return unmodifiableList(getMembers().stream() - .filter(m -> m instanceof MethodDeclaration) - .map(m -> (MethodDeclaration) m) - .collect(toList())); + return unmodifiableList(getMembers().stream().filter(m -> m instanceof MethodDeclaration).map(m -> (MethodDeclaration) m).collect(toList())); } /** @@ -351,9 +342,7 @@ default List getMethods() { * @return the methods found */ default List getMethodsByParameterTypes(String... paramTypes) { - return unmodifiableList(getMethods().stream() - .filter(m -> m.hasParametersOfType(paramTypes)) - .collect(toList())); + return unmodifiableList(getMethods().stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList())); } /** @@ -365,9 +354,7 @@ default List getMethodsByParameterTypes(String... paramTypes) * @return the methods found */ default List getMethodsBySignature(String name, String... paramTypes) { - return unmodifiableList(getMethodsByName(name).stream() - .filter(m -> m.hasParametersOfType(paramTypes)) - .collect(toList())); + return unmodifiableList(getMethodsByName(name).stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList())); } /** @@ -383,9 +370,7 @@ default List getMethodsBySignature(String name, String... par * @return the methods found */ default List getMethodsByParameterTypes(Class... paramTypes) { - return unmodifiableList(getMethods().stream() - .filter(m -> m.hasParametersOfType(paramTypes)) - .collect(toList())); + return unmodifiableList(getMethods().stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList())); } /** @@ -396,10 +381,7 @@ default List getMethodsByParameterTypes(Class... paramType * @return the constructors found. This list is immutable. */ default List getConstructors() { - return unmodifiableList(getMembers().stream() - .filter(m -> m instanceof ConstructorDeclaration) - .map(m -> (ConstructorDeclaration) m) - .collect(toList())); + return unmodifiableList(getMembers().stream().filter(m -> m instanceof ConstructorDeclaration).map(m -> (ConstructorDeclaration) m).collect(toList())); } /** @@ -408,11 +390,7 @@ default List getConstructors() { * @return the constructor found, if any. */ default Optional getDefaultConstructor() { - return getMembers().stream() - .filter(m -> m instanceof ConstructorDeclaration) - .map(m -> (ConstructorDeclaration) m) - .filter(cd -> cd.getParameters().isEmpty()) - .findFirst(); + return getMembers().stream().filter(m -> m instanceof ConstructorDeclaration).map(m -> (ConstructorDeclaration) m).filter(cd -> cd.getParameters().isEmpty()).findFirst(); } /** @@ -432,9 +410,7 @@ default Optional getDefaultConstructor() { * @return the constructor found, if any. */ default Optional getConstructorByParameterTypes(String... paramTypes) { - return getConstructors().stream() - .filter(m -> m.hasParametersOfType(paramTypes)) - .findFirst(); + return getConstructors().stream().filter(m -> m.hasParametersOfType(paramTypes)).findFirst(); } /** @@ -450,9 +426,7 @@ default Optional getConstructorByParameterTypes(String.. * @return the constructor found, if any. */ default Optional getConstructorByParameterTypes(Class... paramTypes) { - return getConstructors().stream() - .filter(m -> m.hasParametersOfType(paramTypes)) - .findFirst(); + return getConstructors().stream().filter(m -> m.hasParametersOfType(paramTypes)).findFirst(); } /** @@ -462,12 +436,7 @@ default Optional getConstructorByParameterTypes(Class * @return null if not found, the FieldDeclaration otherwise */ default Optional getFieldByName(String name) { - return getMembers().stream() - .filter(m -> m instanceof FieldDeclaration) - .map(f -> (FieldDeclaration) f) - .filter(f -> f.getVariables().stream() - .anyMatch(var -> var.getNameAsString().equals(name))) - .findFirst(); + return getMembers().stream().filter(m -> m instanceof FieldDeclaration).map(f -> (FieldDeclaration) f).filter(f -> f.getVariables().stream().anyMatch(var -> var.getNameAsString().equals(name))).findFirst(); } /** @@ -476,10 +445,7 @@ default Optional getFieldByName(String name) { * @return the fields found. This list is immutable. */ default List getFields() { - return unmodifiableList(getMembers().stream() - .filter(m -> m instanceof FieldDeclaration) - .map(m -> (FieldDeclaration) m) - .collect(toList())); + return unmodifiableList(getMembers().stream().filter(m -> m instanceof FieldDeclaration).map(m -> (FieldDeclaration) m).collect(toList())); } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java index 498ec170cb..b36e657b12 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java @@ -20,8 +20,8 @@ */ package com.github.javaparser.ast.nodeTypes; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static com.github.javaparser.ast.NodeList.toNodeList; - import com.github.javaparser.ast.AccessSpecifier; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; @@ -33,7 +33,7 @@ * A Node with Modifiers. * Note that not all modifiers may be valid for this node. */ -public interface NodeWithModifiers { +public interface NodeWithModifiers { /** * Return the modifiers of this variable declaration. @@ -63,9 +63,7 @@ default N addModifier(Modifier.Keyword... newModifiers) { @SuppressWarnings("unchecked") default N removeModifier(Modifier.Keyword... modifiersToRemove) { List modifiersToRemoveAsList = Arrays.asList(modifiersToRemove); - NodeList remaining = getModifiers().stream() - .filter(existingModifier -> !modifiersToRemoveAsList.contains(existingModifier.getKeyword())) - .collect(toNodeList()); + NodeList remaining = getModifiers().stream().filter(existingModifier -> !modifiersToRemoveAsList.contains(existingModifier.getKeyword())).collect(toNodeList()); setModifiers(remaining); return (N) this; } @@ -93,7 +91,7 @@ default boolean hasModifier(Modifier.Keyword modifier) { /** * Creates a list of modifier nodes corresponding to the keywords passed, and set it. */ - default N setModifiers(final Modifier.Keyword... modifiers) { + default N setModifiers(final Modifier.DefaultKeyword... modifiers) { return setModifiers(Arrays.stream(modifiers).map(Modifier::new).collect(toNodeList())); } @@ -103,13 +101,15 @@ default N setModifiers(final Modifier.Keyword... modifiers) { */ default AccessSpecifier getAccessSpecifier() { for (Modifier modifier : getModifiers()) { - switch (modifier.getKeyword()) { - case PUBLIC: - return AccessSpecifier.PUBLIC; - case PROTECTED: - return AccessSpecifier.PROTECTED; - case PRIVATE: - return AccessSpecifier.PRIVATE; + if (modifier.getKeyword() instanceof Modifier.DefaultKeyword dk) { + switch(dk) { + case PUBLIC: + return AccessSpecifier.PUBLIC; + case PROTECTED: + return AccessSpecifier.PROTECTED; + case PRIVATE: + return AccessSpecifier.PRIVATE; + } } } return AccessSpecifier.NONE; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java index b7e958f981..ff87fc4cd1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseName; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Name; @@ -33,7 +32,7 @@ * * @since 2.0.1 */ -public interface NodeWithName { +public interface NodeWithName { Name getName(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalBlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalBlockStmt.java index dfc475534c..5dac4152e2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalBlockStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalBlockStmt.java @@ -27,7 +27,7 @@ /** * A node with a body that is a BlockStmt, which is optional. */ -public interface NodeWithOptionalBlockStmt { +public interface NodeWithOptionalBlockStmt { Optional getBody(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java index 2a650c00f1..a8f41679f6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.SimpleName; import java.util.Optional; @@ -29,7 +28,7 @@ /** * A node that has an optional label. */ -public interface NodeWithOptionalLabel { +public interface NodeWithOptionalLabel { Optional getLabel(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScope.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScope.java index 9fdbe27ab9..fdc118c5bd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScope.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScope.java @@ -27,7 +27,7 @@ /** * Represents a node which has an optional scope expression eg. method calls (object.method()). */ -public interface NodeWithOptionalScope extends NodeWithTraversableScope { +public interface NodeWithOptionalScope extends NodeWithTraversableScope { Optional getScope(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java index a944ec3ae5..9c594ca4e3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseType; import static java.util.stream.Collectors.toList; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.Parameter; @@ -31,7 +30,7 @@ import java.util.Optional; import java.util.stream.Stream; -public interface NodeWithParameters { +public interface NodeWithParameters { NodeList getParameters(); @@ -106,9 +105,7 @@ default Parameter addAndGetParameter(Parameter parameter) { * @return null if not found, the param found otherwise */ default Optional getParameterByName(String name) { - return getParameters().stream() - .filter(p -> p.getNameAsString().equals(name)) - .findFirst(); + return getParameters().stream().filter(p -> p.getNameAsString().equals(name)).findFirst(); } /** @@ -118,9 +115,7 @@ default Optional getParameterByName(String name) { * @return null if not found, the param found otherwise */ default Optional getParameterByType(String type) { - return getParameters().stream() - .filter(p -> p.getType().toString().equals(type)) - .findFirst(); + return getParameters().stream().filter(p -> p.getType().toString().equals(type)).findFirst(); } /** @@ -130,9 +125,7 @@ default Optional getParameterByType(String type) { * @return null if not found, the param found otherwise */ default Optional getParameterByType(Class type) { - return getParameters().stream() - .filter(p -> p.getType().toString().equals(type.getSimpleName())) - .findFirst(); + return getParameters().stream().filter(p -> p.getType().toString().equals(type.getSimpleName())).findFirst(); } /** @@ -151,10 +144,7 @@ default Optional getParameterByType(Class type) { * @return {@code true} if all parameters match one by one, in the given order. */ default boolean hasParametersOfType(String... paramTypes) { - return getParameters().stream() - .map(p -> p.getType().asString()) - .collect(toList()) - .equals(Arrays.asList(paramTypes)); + return getParameters().stream().map(p -> p.getType().asString()).collect(toList()).equals(Arrays.asList(paramTypes)); } /** @@ -170,15 +160,9 @@ default boolean hasParametersOfType(String... paramTypes) { * @return {@code true} if all parameters match one by one, in the given order. */ default boolean hasParametersOfType(Class... paramTypes) { - return getParameters().stream() - . // if p.getType() is a class or interface type, we want to consider its erasure, i.e., if the - // parameter - // is "List", we want to consider it as "List", so we need to call getName() - map(p -> p.getType() - .toClassOrInterfaceType() - .map(NodeWithSimpleName::getNameAsString) - .orElseGet(() -> p.getType().asString())) - .collect(toList()) - .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toList())); + return getParameters().stream().// if p.getType() is a class or interface type, we want to consider its erasure, i.e., if the + // parameter + // is "List", we want to consider it as "List", so we need to call getName() + map(p -> p.getType().toClassOrInterfaceType().map(NodeWithSimpleName::getNameAsString).orElseGet(() -> p.getType().asString())).collect(toList()).equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toList())); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithRange.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithRange.java index 54cc1f6efd..62100b0701 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithRange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithRange.java @@ -28,7 +28,7 @@ /** * A node that has a Range, which is every Node. */ -public interface NodeWithRange { +public interface NodeWithRange { Optional getRange(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithScope.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithScope.java index 539fca62a1..5522eae75d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithScope.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithScope.java @@ -27,7 +27,7 @@ /** * Represents a node which has a required scope expression eg. field access (object.method). */ -public interface NodeWithScope extends NodeWithTraversableScope { +public interface NodeWithScope extends NodeWithTraversableScope { Expression getScope(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java index e365676558..4f73bbb5a6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.ast.expr.SimpleName; @@ -31,7 +30,7 @@ *

* The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getName method. */ -public interface NodeWithSimpleName { +public interface NodeWithSimpleName { SimpleName getName(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java index 1ebaede21c..56e5f8b8a5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseStatement; - import com.github.javaparser.JavaParser; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; @@ -33,7 +32,7 @@ /** * A node that contains a list of statements. */ -public interface NodeWithStatements { +public interface NodeWithStatements { NodeList getStatements(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java index 51d158ee87..f5b8acf854 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.ReferenceType; @@ -29,7 +28,7 @@ /** * A node that declares the types of exception it throws. */ -public interface NodeWithThrownExceptions { +public interface NodeWithThrownExceptions { N setThrownExceptions(NodeList thrownExceptions); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTokenRange.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTokenRange.java index 55c8308e32..1aa5140c3e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTokenRange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTokenRange.java @@ -26,7 +26,7 @@ /** * A node that has a Range, which is every Node. */ -public interface NodeWithTokenRange { +public interface NodeWithTokenRange { Optional getTokenRange(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTraversableScope.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTraversableScope.java index 341d16060a..f281a7414e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTraversableScope.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTraversableScope.java @@ -27,7 +27,7 @@ * Represents a node which has a scope expression that can be traversed/walked. * This unifies scope access for NodeWithScope and NodeWithOptionalScope. */ -public interface NodeWithTraversableScope { +public interface NodeWithTraversableScope { /** * @return the scope of this node, regardless of optionality. diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java index f1f8517d85..0e392aa633 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java @@ -22,7 +22,6 @@ import static com.github.javaparser.StaticJavaParser.parseType; import static com.github.javaparser.utils.Utils.assertNonEmpty; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.type.Type; @@ -35,7 +34,7 @@ * * @since 2.3.1 */ -public interface NodeWithType { +public interface NodeWithType { /** * Gets the type diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java index 04394fddd7..90b310db1a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.ast.NodeList.nodeList; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.Type; @@ -39,7 +38,7 @@ * Only ObjectCreationExpr uses the diamond operator. * On other nodes it is treated the same as the first case. */ -public interface NodeWithTypeArguments { +public interface NodeWithTypeArguments { /** * @return the types that can be found in the type arguments: {@code }. diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java index 72c5e34a43..7a58685eec 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.nodeTypes; import static com.github.javaparser.StaticJavaParser.parseTypeParameter; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.TypeParameter; @@ -34,7 +33,7 @@ * class X<C,D> {} --> typeParameters = [C,D] * */ -public interface NodeWithTypeParameters { +public interface NodeWithTypeParameters { NodeList getTypeParameters(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java index 7f59807c76..d7ee622d53 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java @@ -33,7 +33,7 @@ /** * A node which has a list of variables. */ -public interface NodeWithVariables { +public interface NodeWithVariables { NodeList getVariables(); @@ -123,8 +123,7 @@ default N setAllTypes(Type newType) { */ @DerivedProperty default Optional getMaximumCommonType() { - return calculateMaximumCommonType( - getVariables().stream().map(v -> v.getType()).collect(Collectors.toList())); + return calculateMaximumCommonType(getVariables().stream().map(v -> v.getType()).collect(Collectors.toList())); } static Optional calculateMaximumCommonType(List types) { @@ -158,13 +157,10 @@ private Optional toArrayLevel(Type type, int level) { // Now, given that equality on nodes consider the position the simplest way is to compare // the pretty-printed string got for a node. We just check all them are the same and if they // are we just just is not null - Object[] values = types.stream() - .map(v -> { - Optional t = helper.toArrayLevel(v, currentLevel); - return t.map(Node::toString).orElse(null); - }) - .distinct() - .toArray(); + Object[] values = types.stream().map(v -> { + Optional t = helper.toArrayLevel(v, currentLevel); + return t.map(Node::toString).orElse(null); + }).distinct().toArray(); if (values.length == 1 && values[0] != null) { level++; } else { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/SwitchNode.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/SwitchNode.java index 9c0010f7ee..d98e77eded 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/SwitchNode.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/SwitchNode.java @@ -30,7 +30,7 @@ /** * The common interface of {@link com.github.javaparser.ast.expr.SwitchExpr} and {@link com.github.javaparser.ast.stmt.SwitchStmt} */ -public interface SwitchNode { +public interface SwitchNode { NodeList getEntries(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java index a77fa30ae4..c4acf5d8f8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.ABSTRACT; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.ABSTRACT; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be abstract. */ -public interface NodeWithAbstractModifier extends NodeWithModifiers { +public interface NodeWithAbstractModifier extends NodeWithModifiers { default boolean isAbstract() { return hasModifier(ABSTRACT); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java index ffd61cfd56..410ea05634 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java @@ -25,5 +25,5 @@ /** * A node that can be public, protected, and/or private. */ -public interface NodeWithAccessModifiers - extends NodeWithPublicModifier, NodeWithPrivateModifier, NodeWithProtectedModifier {} +public interface NodeWithAccessModifiers extends NodeWithPublicModifier, NodeWithPrivateModifier, NodeWithProtectedModifier { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java index 3cc1158f14..ea813cf55b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.FINAL; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.FINAL; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be final. */ -public interface NodeWithFinalModifier extends NodeWithModifiers { +public interface NodeWithFinalModifier extends NodeWithModifiers { /** * @return true, if the modifier {@code final} is explicitly added to this node. If the node is implicitly final diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java index 83725a3599..475ddd09ae 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.PRIVATE; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PRIVATE; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be private. */ -public interface NodeWithPrivateModifier extends NodeWithModifiers { +public interface NodeWithPrivateModifier extends NodeWithModifiers { default boolean isPrivate() { return hasModifier(PRIVATE); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java index e4c3bb82ad..423a29ea52 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be protected. */ -public interface NodeWithProtectedModifier extends NodeWithModifiers { +public interface NodeWithProtectedModifier extends NodeWithModifiers { default boolean isProtected() { return hasModifier(PROTECTED); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java index fd8908bba7..4c74ef8cae 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be public. */ -public interface NodeWithPublicModifier extends NodeWithModifiers { +public interface NodeWithPublicModifier extends NodeWithModifiers { default boolean isPublic() { return hasModifier(PUBLIC); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java index f110e0ffe0..e3719b9af5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.STATIC; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be static. */ -public interface NodeWithStaticModifier extends NodeWithModifiers { +public interface NodeWithStaticModifier extends NodeWithModifiers { /** * @return true, if the modifier {@code static} is explicitly added to this node. If the node is implicitly static diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java index bde841b630..384de05b20 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java @@ -20,15 +20,14 @@ */ package com.github.javaparser.ast.nodeTypes.modifiers; -import static com.github.javaparser.ast.Modifier.Keyword.STRICTFP; - +import static com.github.javaparser.ast.Modifier.DefaultKeyword.STRICTFP; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.nodeTypes.NodeWithModifiers; /** * A node that can be strictfp. */ -public interface NodeWithStrictfpModifier extends NodeWithModifiers { +public interface NodeWithStrictfpModifier extends NodeWithModifiers { default boolean isStrictfp() { return hasModifier(STRICTFP); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java index 8fbb575cb3..06b3d98ea6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java @@ -26,14 +26,14 @@ /** * An Observer for an AST element (either a Node or a NodeList). */ -public interface AstObserver { +public interface AstObserver { /** * Type of change occurring on a List */ enum ListChangeType { - ADDITION, - REMOVAL + + ADDITION, REMOVAL } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserverAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserverAdapter.java index b2911fe5af..3dda3739f5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserverAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserverAdapter.java @@ -26,22 +26,22 @@ public abstract class AstObserverAdapter implements AstObserver { @Override - public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { // do nothing } @Override - public void parentChange(Node observedNode, Node previousParent, Node newParent) { + public void parentChange(Node observedNode, Node previousParent, Node newParent) { // do nothing } @Override - public void listChange(NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { + public void listChange(NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { // do nothing } @Override - public void listReplacement(NodeList observedNode, int index, Node oldNode, Node newNode) { + public void listReplacement(NodeList observedNode, int index, Node oldNode, Node newNode) { // do nothing } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/Observable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/Observable.java index a1829fa31c..100ffbd3b2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/Observable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/Observable.java @@ -23,7 +23,7 @@ /** * Observable element. */ -public interface Observable { +public interface Observable { /** * Register an observer. 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 837738835b..2eedc19149 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 @@ -33,21 +33,32 @@ * Properties considered by the AstObserver */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") -public enum ObservableProperty { +public enum ObservableProperty { + ANNOTATIONS(Type.MULTIPLE_REFERENCE), ANONYMOUS_CLASS_BODY(Type.MULTIPLE_REFERENCE), ARGUMENTS(Type.MULTIPLE_REFERENCE), + ARGUMENT_TYPES(Type.MULTIPLE_REFERENCE), ASTERISK(Type.SINGLE_ATTRIBUTE), + BEHAVIOR(Type.SINGLE_ATTRIBUTE), + BINDER(Type.SINGLE_ATTRIBUTE), + BINDING(Type.SINGLE_REFERENCE), BODY(Type.SINGLE_REFERENCE), + BOUNDED_VARIABLES(Type.MULTIPLE_REFERENCE), CATCH_CLAUSES(Type.MULTIPLE_REFERENCE), CHECK(Type.SINGLE_REFERENCE), CLASS_BODY(Type.MULTIPLE_REFERENCE), CLASS_DECLARATION(Type.SINGLE_REFERENCE), + CLAUSES(Type.MULTIPLE_REFERENCE), COMMENT(Type.SINGLE_REFERENCE), COMPARE(Type.SINGLE_REFERENCE), COMPONENT_TYPE(Type.SINGLE_REFERENCE), CONDITION(Type.SINGLE_REFERENCE), CONTENT(Type.SINGLE_ATTRIBUTE), + CONTRACT(Type.SINGLE_REFERENCE), + CONTRACTS(Type.MULTIPLE_REFERENCE), + DECL(Type.SINGLE_REFERENCE), + DECLARATIONS(Type.SINGLE_REFERENCE), DEFAULT(Type.SINGLE_ATTRIBUTE), DEFAULT_VALUE(Type.SINGLE_REFERENCE), DIMENSION(Type.SINGLE_REFERENCE), @@ -58,11 +69,14 @@ public enum ObservableProperty { ELSE_STMT(Type.SINGLE_REFERENCE), ENCLOSING_PARAMETERS(Type.SINGLE_ATTRIBUTE), ENTRIES(Type.MULTIPLE_REFERENCE), + EXPR(Type.SINGLE_REFERENCE), EXPRESSION(Type.SINGLE_REFERENCE), + EXPRESSIONS(Type.MULTIPLE_REFERENCE), EXTENDED_TYPE(Type.SINGLE_REFERENCE), EXTENDED_TYPES(Type.MULTIPLE_REFERENCE), FINALLY_BLOCK(Type.SINGLE_REFERENCE), GUARD(Type.SINGLE_REFERENCE), + HEAPS(Type.MULTIPLE_REFERENCE), IDENTIFIER(Type.SINGLE_ATTRIBUTE), IMPLEMENTED_TYPES(Type.MULTIPLE_REFERENCE), IMPORTS(Type.MULTIPLE_REFERENCE), @@ -71,21 +85,30 @@ public enum ObservableProperty { INITIALIZER(Type.SINGLE_REFERENCE), INNER(Type.SINGLE_REFERENCE), INTERFACE(Type.SINGLE_ATTRIBUTE), + INVARIANT(Type.SINGLE_REFERENCE), ITERABLE(Type.SINGLE_REFERENCE), + JML_COMMENTS(Type.MULTIPLE_REFERENCE), + JML_MODEL(Type.SINGLE_ATTRIBUTE), + JML_TAGS(Type.MULTIPLE_REFERENCE), KEYWORD(Type.SINGLE_ATTRIBUTE), + KIND(Type.SINGLE_ATTRIBUTE), LABEL(Type.SINGLE_REFERENCE), LABELS(Type.MULTIPLE_REFERENCE), LEFT(Type.SINGLE_REFERENCE), LEVELS(Type.MULTIPLE_REFERENCE), + MEASURED_BY(Type.SINGLE_REFERENCE), MEMBERS(Type.MULTIPLE_REFERENCE), MEMBER_VALUE(Type.SINGLE_REFERENCE), MESSAGE(Type.SINGLE_REFERENCE), + METHOD_DECLARATION(Type.SINGLE_REFERENCE), + METHOD_SIGNATURES(Type.MULTIPLE_REFERENCE), MODIFIERS(Type.MULTIPLE_REFERENCE), MODULE(Type.SINGLE_REFERENCE), MODULE_NAMES(Type.MULTIPLE_REFERENCE), NAME(Type.SINGLE_REFERENCE), OPEN(Type.SINGLE_ATTRIBUTE), OPERATOR(Type.SINGLE_ATTRIBUTE), + OPERATORS(Type.SINGLE_ATTRIBUTE), ORIGIN(Type.SINGLE_ATTRIBUTE), PACKAGE_DECLARATION(Type.SINGLE_REFERENCE), PAIRS(Type.MULTIPLE_REFERENCE), @@ -94,7 +117,9 @@ public enum ObservableProperty { PATTERN(Type.SINGLE_REFERENCE), PATTERN_LIST(Type.MULTIPLE_REFERENCE), PERMITTED_TYPES(Type.MULTIPLE_REFERENCE), + PREDICATE(Type.SINGLE_REFERENCE), QUALIFIER(Type.SINGLE_REFERENCE), + RECEIVER(Type.SINGLE_REFERENCE), RECEIVER_PARAMETER(Type.SINGLE_REFERENCE), RECORD_DECLARATION(Type.SINGLE_REFERENCE), RESOURCES(Type.MULTIPLE_REFERENCE), @@ -104,8 +129,10 @@ public enum ObservableProperty { STATEMENT(Type.SINGLE_REFERENCE), STATEMENTS(Type.MULTIPLE_REFERENCE), STATIC(Type.SINGLE_ATTRIBUTE), + SUB_CONTRACTS(Type.MULTIPLE_REFERENCE), SUPER_TYPE(Type.SINGLE_REFERENCE), TARGET(Type.SINGLE_REFERENCE), + THEN(Type.SINGLE_REFERENCE), THEN_EXPR(Type.SINGLE_REFERENCE), THEN_STMT(Type.SINGLE_REFERENCE), THIS(Type.SINGLE_ATTRIBUTE), @@ -139,10 +166,8 @@ public enum ObservableProperty { COMMENTED_NODE; enum Type { - SINGLE_ATTRIBUTE(false, false), - SINGLE_REFERENCE(false, true), - MULTIPLE_ATTRIBUTE(true, false), - MULTIPLE_REFERENCE(true, true); + + SINGLE_ATTRIBUTE(false, false), SINGLE_REFERENCE(false, true), MULTIPLE_ATTRIBUTE(true, false), MULTIPLE_REFERENCE(true, true); private boolean multiple; @@ -159,9 +184,7 @@ enum Type { private boolean derived; public static ObservableProperty fromCamelCaseName(String camelCaseName) { - Optional observableProperty = Arrays.stream(values()) - .filter(v -> v.camelCaseName().equals(camelCaseName)) - .findFirst(); + Optional observableProperty = Arrays.stream(values()).filter(v -> v.camelCaseName().equals(camelCaseName)).findFirst(); if (observableProperty.isPresent()) { return observableProperty.get(); } @@ -182,31 +205,31 @@ public static ObservableProperty fromCamelCaseName(String camelCaseName) { this(Type.SINGLE_REFERENCE, false); } - public boolean isDerived() { + public boolean isDerived() { return derived; } - public boolean isAboutNodes() { + public boolean isAboutNodes() { return type.node; } - public boolean isAboutValues() { + public boolean isAboutValues() { return !isAboutNodes(); } - public boolean isMultiple() { + public boolean isMultiple() { return type.multiple; } - public boolean isSingle() { + public boolean isSingle() { return !isMultiple(); } - public String camelCaseName() { + public String camelCaseName() { return Utils.screamingToCamelCase(name()); } - public Node getValueAsSingleReference(Node node) { + public Node getValueAsSingleReference(Node node) { Object rawValue = getRawValue(node); try { if (rawValue instanceof Node) { @@ -219,9 +242,7 @@ public Node getValueAsSingleReference(Node node) { } return null; } - throw new RuntimeException(String.format( - "Property %s returned %s (%s)", - this.name(), rawValue.toString(), rawValue.getClass().getCanonicalName())); + throw new RuntimeException(String.format("Property %s returned %s (%s)", this.name(), rawValue.toString(), rawValue.getClass().getCanonicalName())); } catch (ClassCastException e) { throw new RuntimeException(e); } @@ -236,7 +257,7 @@ private boolean hasMethod(Node node, String name) { } } - public NodeList getValueAsMultipleReference(Node node) { + public NodeList getValueAsMultipleReference(Node node) { Object rawValue = getRawValue(node); try { if (rawValue == null) { @@ -251,34 +272,28 @@ public NodeList getValueAsMultipleReference(Node node) { } return null; } catch (ClassCastException e) { - throw new RuntimeException( - "Unable to get list value for " + this.name() + " from " + node + " (class: " - + node.getClass().getSimpleName() + ")", - e); + throw new RuntimeException("Unable to get list value for " + this.name() + " from " + node + " (class: " + node.getClass().getSimpleName() + ")", e); } } - public Collection getValueAsCollection(Node node) { + public Collection getValueAsCollection(Node node) { Object rawValue = getRawValue(node); try { return (Collection) rawValue; } catch (ClassCastException e) { - throw new RuntimeException( - "Unable to get list value for " + this.name() + " from " + node + " (class: " - + node.getClass().getSimpleName() + ")", - e); + throw new RuntimeException("Unable to get list value for " + this.name() + " from " + node + " (class: " + node.getClass().getSimpleName() + ")", e); } } - public String getValueAsStringAttribute(Node node) { + public String getValueAsStringAttribute(Node node) { return (String) getRawValue(node); } - public Boolean getValueAsBooleanAttribute(Node node) { + public Boolean getValueAsBooleanAttribute(Node node) { return (Boolean) getRawValue(node); } - public Object getRawValue(Node node) { + public Object getRawValue(Node node) { String getterName = "get" + Utils.capitalize(camelCaseName()); if (!hasMethod(node, getterName)) { getterName = "is" + Utils.capitalize(camelCaseName()); @@ -289,22 +304,19 @@ public Object getRawValue(Node node) { try { return node.getClass().getMethod(getterName).invoke(node); } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException( - "Unable to get value for " + this.name() + " from " + node + " (" - + node.getClass().getSimpleName() + ")", - e); + throw new RuntimeException("Unable to get value for " + this.name() + " from " + node + " (" + node.getClass().getSimpleName() + ")", e); } } - public boolean isNull(Node node) { + public boolean isNull(Node node) { return null == getRawValue(node); } - public boolean isNullOrNotPresent(Node node) { + public boolean isNullOrNotPresent(Node node) { return Utils.valueIsNullOrEmptyStringOrOptional(getRawValue(node)); } - public boolean isNullOrEmpty(Node node) { + public boolean isNullOrEmpty(Node node) { return Utils.valueIsNullOrEmpty(getRawValue(node)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java index 945fe02884..7ab74ce256 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java @@ -39,19 +39,17 @@ public static PropagatingAstObserver transformInPropagatingObserver(final AstObs return new PropagatingAstObserver() { @Override - public void concretePropertyChange( - Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { observer.propertyChange(observedNode, property, oldValue, newValue); } @Override - public void concreteListChange( - NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { + public void concreteListChange(NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { observer.listChange(observedNode, type, index, nodeAddedOrRemoved); } @Override - public void parentChange(Node observedNode, Node previousParent, Node newParent) { + public void parentChange(Node observedNode, Node previousParent, Node newParent) { observer.parentChange(observedNode, previousParent, newParent); } }; @@ -75,7 +73,7 @@ public final void listChange(NodeList observedNode, ListChangeType type, int } @Override - public void listReplacement(NodeList observedNode, int index, Node oldNode, Node newNode) { + public void listReplacement(NodeList observedNode, int index, Node oldNode, Node newNode) { if (oldNode == newNode) { return; } @@ -84,21 +82,20 @@ public void listReplacement(NodeList observedNode, int index, Node oldNode, N concreteListReplacement(observedNode, index, oldNode, newNode); } - public void concretePropertyChange( - Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { // do nothing } - public void concreteListChange(NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { + public void concreteListChange(NodeList observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) { // do nothing } - public void concreteListReplacement(NodeList observedNode, int index, Node oldValue, Node newValue) { + public void concreteListReplacement(NodeList observedNode, int index, Node oldValue, Node newValue) { // do nothing } @Override - public void parentChange(Node observedNode, Node previousParent, Node newParent) { + public void parentChange(Node observedNode, Node previousParent, Node newParent) { // do nothing } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java index 7bbd3a9b43..e0a25f08dd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java @@ -33,10 +33,8 @@ import com.github.javaparser.metamodel.AssertStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.OptionalProperty; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -45,23 +43,23 @@ * * @author Julio Vilmar Gesser */ -public class AssertStmt extends Statement { +public class AssertStmt extends Statement { private Expression check; @OptionalProperty private Expression message; - public AssertStmt() { + public AssertStmt() { this(null, new BooleanLiteralExpr(), null); } - public AssertStmt(final Expression check) { + public AssertStmt(final Expression check) { this(null, check, null); } @AllFieldsConstructor - public AssertStmt(final Expression check, final Expression message) { + public AssertStmt(final Expression check, final Expression message) { this(null, check, message); } @@ -69,7 +67,7 @@ public AssertStmt(final Expression check, final Expression message) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public AssertStmt(TokenRange tokenRange, Expression check, Expression message) { + public AssertStmt(TokenRange tokenRange, Expression check, Expression message) { super(tokenRange); setCheck(check); setMessage(message); @@ -78,34 +76,35 @@ public AssertStmt(TokenRange tokenRange, Expression check, Expression message) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCheck() { + public Expression getCheck() { return check; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getMessage() { + public Optional getMessage() { return Optional.ofNullable(message); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AssertStmt setCheck(final Expression check) { + public AssertStmt setCheck(final Expression check) { assertNotNull(check); if (check == this.check) { return this; } notifyPropertyChange(ObservableProperty.CHECK, this.check, check); - if (this.check != null) this.check.setParentNode(null); + if (this.check != null) + this.check.setParentNode(null); this.check = check; setAsParentNodeOf(check); return this; @@ -118,12 +117,13 @@ public AssertStmt setCheck(final Expression check) { * @return this, the AssertStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public AssertStmt setMessage(final Expression message) { + public AssertStmt setMessage(final Expression message) { if (message == this.message) { return this; } notifyPropertyChange(ObservableProperty.MESSAGE, this.message, message); - if (this.message != null) this.message.setParentNode(null); + if (this.message != null) + this.message.setParentNode(null); this.message = message; setAsParentNodeOf(message); return this; @@ -131,7 +131,7 @@ public AssertStmt setMessage(final Expression message) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -145,25 +145,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public AssertStmt removeMessage() { + public AssertStmt removeMessage() { return setMessage((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public AssertStmt clone() { + public AssertStmt clone() { return (AssertStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public AssertStmtMetaModel getMetaModel() { + public AssertStmtMetaModel getMetaModel() { return JavaParserMetaModel.assertStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -182,25 +182,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAssertStmt() { + public boolean isAssertStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AssertStmt asAssertStmt() { + public AssertStmt asAssertStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAssertStmt(Consumer action) { + public void ifAssertStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAssertStmt() { + public Optional toAssertStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java index 6d12e3cbe1..fff90450aa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java @@ -7,7 +7,7 @@ * @author Alexander Weigl * @version 1 (3/14/21) */ -public enum Behavior implements Jmlish, JmlKeyword { +public enum Behavior implements Jmlish, JmlKeyword { NONE(""), BEHAVIOR("behavior"), @@ -26,7 +26,7 @@ public enum Behavior implements Jmlish, JmlKeyword { } @Override - public String jmlSymbol() { + public String jmlSymbol() { return symbol; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java index 792f579764..d30a34cbbd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java @@ -25,6 +25,8 @@ import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithStatements; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.CloneVisitor; @@ -32,10 +34,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.BlockStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -43,26 +43,26 @@ * * @author Julio Vilmar Gesser */ -public class BlockStmt extends Statement implements NodeWithStatements, NodeWithContracts { +public class BlockStmt extends Statement implements NodeWithStatements, NodeWithContracts { private NodeList statements; private NodeList contracts = new NodeList<>(); - public BlockStmt() { + public BlockStmt() { this(null, new NodeList<>(), new NodeList<>()); } - public BlockStmt(NodeList statements) { + public BlockStmt(NodeList statements) { this(null, statements, new NodeList<>()); } @AllFieldsConstructor - public BlockStmt(final NodeList statements, final NodeList contracts) { + public BlockStmt(final NodeList statements, final NodeList contracts) { this(null, statements, contracts); } - public BlockStmt(TokenRange tokenRange, NodeList statements) { + public BlockStmt(TokenRange tokenRange, NodeList statements) { this(tokenRange, statements, new NodeList<>()); } @@ -70,7 +70,7 @@ public BlockStmt(TokenRange tokenRange, NodeList statements) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BlockStmt(TokenRange tokenRange, NodeList statements, NodeList contracts) { + public BlockStmt(TokenRange tokenRange, NodeList statements, NodeList contracts) { super(tokenRange); setStatements(statements); setContracts(contracts); @@ -79,29 +79,30 @@ public BlockStmt(TokenRange tokenRange, NodeList statements, NodeList @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getStatements() { + public NodeList getStatements() { return statements; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt setStatements(final NodeList statements) { + public BlockStmt setStatements(final NodeList statements) { assertNotNull(statements); if (statements == this.statements) { return this; } notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements); - if (this.statements != null) this.statements.setParentNode(null); + if (this.statements != null) + this.statements.setParentNode(null); this.statements = statements; setAsParentNodeOf(statements); return this; @@ -109,7 +110,7 @@ public BlockStmt setStatements(final NodeList statements) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -130,19 +131,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BlockStmt clone() { + public BlockStmt clone() { return (BlockStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BlockStmtMetaModel getMetaModel() { + public BlockStmtMetaModel getMetaModel() { return JavaParserMetaModel.blockStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -163,35 +164,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBlockStmt() { + public boolean isBlockStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BlockStmt asBlockStmt() { + public BlockStmt asBlockStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBlockStmt(Consumer action) { + public void ifBlockStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBlockStmt() { + public Optional toBlockStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt setContracts(final NodeList contracts) { + public BlockStmt setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java index 188507fd2d..3eb12ddf0e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java @@ -55,21 +55,21 @@ * @see com.github.javaparser.ast.expr.SwitchExpr * @see YieldStmt */ -public class BreakStmt extends Statement { +public class BreakStmt extends Statement { @OptionalProperty private SimpleName label; - public BreakStmt() { + public BreakStmt() { this(null, null); } - public BreakStmt(final String label) { + public BreakStmt(final String label) { this(null, new SimpleName(label)); } @AllFieldsConstructor - public BreakStmt(final SimpleName label) { + public BreakStmt(final SimpleName label) { this(null, label); } @@ -77,7 +77,7 @@ public BreakStmt(final SimpleName label) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public BreakStmt(TokenRange tokenRange, SimpleName label) { + public BreakStmt(TokenRange tokenRange, SimpleName label) { super(tokenRange); setLabel(label); customInitialization(); @@ -85,18 +85,18 @@ public BreakStmt(TokenRange tokenRange, SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getLabel() { + public Optional getLabel() { return Optional.ofNullable(label); } @@ -107,12 +107,13 @@ public Optional getLabel() { * @return this, the BreakStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BreakStmt setLabel(final SimpleName label) { + public BreakStmt setLabel(final SimpleName label) { if (label == this.label) { return this; } notifyPropertyChange(ObservableProperty.LABEL, this.label, label); - if (this.label != null) this.label.setParentNode(null); + if (this.label != null) + this.label.setParentNode(null); this.label = label; setAsParentNodeOf(label); return this; @@ -120,7 +121,7 @@ public BreakStmt setLabel(final SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -134,25 +135,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public BreakStmt removeLabel() { + public BreakStmt removeLabel() { return setLabel((SimpleName) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public BreakStmt clone() { + public BreakStmt clone() { return (BreakStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public BreakStmtMetaModel getMetaModel() { + public BreakStmtMetaModel getMetaModel() { return JavaParserMetaModel.breakStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -167,25 +168,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBreakStmt() { + public boolean isBreakStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BreakStmt asBreakStmt() { + public BreakStmt asBreakStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBreakStmt(Consumer action) { + public void ifBreakStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBreakStmt() { + public Optional toBreakStmt() { return Optional.of(this); } } 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 4b80e703f6..1a583c7934 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 @@ -33,7 +33,6 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.CatchClauseMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -42,30 +41,22 @@ * * @author Julio Vilmar Gesser */ -public class CatchClause extends Node implements NodeWithBlockStmt { +public class CatchClause extends Node implements NodeWithBlockStmt { private Parameter parameter; private BlockStmt body; - public CatchClause() { + public CatchClause() { this(null, new Parameter(), new BlockStmt()); } - public CatchClause( - final NodeList exceptModifier, - final NodeList exceptAnnotations, - final ClassOrInterfaceType exceptType, - final SimpleName exceptName, - final BlockStmt body) { - this( - null, - new Parameter(null, exceptModifier, exceptAnnotations, exceptType, false, new NodeList<>(), exceptName), - body); + public CatchClause(final NodeList exceptModifier, final NodeList exceptAnnotations, final ClassOrInterfaceType exceptType, final SimpleName exceptName, final BlockStmt body) { + this(null, new Parameter(null, exceptModifier, exceptAnnotations, exceptType, false, new NodeList<>(), exceptName), body); } @AllFieldsConstructor - public CatchClause(final Parameter parameter, final BlockStmt body) { + public CatchClause(final Parameter parameter, final BlockStmt body) { this(null, parameter, body); } @@ -73,7 +64,7 @@ public CatchClause(final Parameter parameter, final BlockStmt body) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public CatchClause(TokenRange tokenRange, Parameter parameter, BlockStmt body) { + public CatchClause(TokenRange tokenRange, Parameter parameter, BlockStmt body) { super(tokenRange); setParameter(parameter); setBody(body); @@ -82,13 +73,13 @@ public CatchClause(TokenRange tokenRange, Parameter parameter, BlockStmt body) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -98,36 +89,38 @@ public void accept(final VoidVisitor v, final A arg) { * catch(A a | @X B b ...) are found on those types. */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Parameter getParameter() { + public Parameter getParameter() { return parameter; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CatchClause setParameter(final Parameter parameter) { + public CatchClause setParameter(final Parameter parameter) { assertNotNull(parameter); if (parameter == this.parameter) { return this; } notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter); - if (this.parameter != null) this.parameter.setParentNode(null); + if (this.parameter != null) + this.parameter.setParentNode(null); this.parameter = parameter; setAsParentNodeOf(parameter); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getBody() { + public BlockStmt getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CatchClause setBody(final BlockStmt body) { + public CatchClause setBody(final BlockStmt body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; @@ -135,19 +128,19 @@ public CatchClause setBody(final BlockStmt body) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public CatchClause clone() { + public CatchClause clone() { return (CatchClause) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public CatchClauseMetaModel getMetaModel() { + public CatchClauseMetaModel getMetaModel() { return JavaParserMetaModel.catchClauseMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java index a8ec2cb1d8..a3301b8742 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java @@ -43,21 +43,21 @@ * * @author Julio Vilmar Gesser */ -public class ContinueStmt extends Statement implements NodeWithOptionalLabel { +public class ContinueStmt extends Statement implements NodeWithOptionalLabel { @OptionalProperty private SimpleName label; - public ContinueStmt() { + public ContinueStmt() { this(null, null); } - public ContinueStmt(final String label) { + public ContinueStmt(final String label) { this(null, new SimpleName(label)); } @AllFieldsConstructor - public ContinueStmt(final SimpleName label) { + public ContinueStmt(final SimpleName label) { this(null, label); } @@ -65,7 +65,7 @@ public ContinueStmt(final SimpleName label) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ContinueStmt(TokenRange tokenRange, SimpleName label) { + public ContinueStmt(TokenRange tokenRange, SimpleName label) { super(tokenRange); setLabel(label); customInitialization(); @@ -73,18 +73,18 @@ public ContinueStmt(TokenRange tokenRange, SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getLabel() { + public Optional getLabel() { return Optional.ofNullable(label); } @@ -95,12 +95,13 @@ public Optional getLabel() { * @return this, the ContinueStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ContinueStmt setLabel(final SimpleName label) { + public ContinueStmt setLabel(final SimpleName label) { if (label == this.label) { return this; } notifyPropertyChange(ObservableProperty.LABEL, this.label, label); - if (this.label != null) this.label.setParentNode(null); + if (this.label != null) + this.label.setParentNode(null); this.label = label; setAsParentNodeOf(label); return this; @@ -108,7 +109,7 @@ public ContinueStmt setLabel(final SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -122,25 +123,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ContinueStmt removeLabel() { + public ContinueStmt removeLabel() { return setLabel((SimpleName) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ContinueStmt clone() { + public ContinueStmt clone() { return (ContinueStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ContinueStmtMetaModel getMetaModel() { + public ContinueStmtMetaModel getMetaModel() { return JavaParserMetaModel.continueStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -155,25 +156,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isContinueStmt() { + public boolean isContinueStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ContinueStmt asContinueStmt() { + public ContinueStmt asContinueStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifContinueStmt(Consumer action) { + public void ifContinueStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toContinueStmt() { + public Optional toContinueStmt() { return Optional.of(this); } } 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 af000565eb..2475c23d21 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 @@ -24,8 +24,11 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.BooleanLiteralExpr; import com.github.javaparser.ast.expr.Expression; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.nodeTypes.NodeWithCondition; import com.github.javaparser.ast.observer.ObservableProperty; @@ -34,10 +37,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.DoStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -46,7 +47,7 @@ * * @author Julio Vilmar Gesser */ -public class DoStmt extends Statement implements NodeWithBody, NodeWithCondition, NodeWithContracts { +public class DoStmt extends Statement implements NodeWithBody, NodeWithCondition, NodeWithContracts { private NodeList contracts; @@ -54,20 +55,20 @@ public class DoStmt extends Statement implements NodeWithBody, NodeWithC private Expression condition; - public DoStmt() { + public DoStmt() { this(new ReturnStmt(), new BooleanLiteralExpr()); } @AllFieldsConstructor - public DoStmt(final Statement body, final Expression condition, final NodeList contracts) { + public DoStmt(final Statement body, final Expression condition, final NodeList contracts) { this(null, body, condition, contracts); } - public DoStmt(final Statement body, final Expression condition) { + public DoStmt(final Statement body, final Expression condition) { this(body, condition, new NodeList<>()); } - public DoStmt(TokenRange tokenRange, Statement body, Expression condition) { + public DoStmt(TokenRange tokenRange, Statement body, Expression condition) { this(tokenRange, body, condition, new NodeList<>()); } @@ -75,7 +76,7 @@ public DoStmt(TokenRange tokenRange, Statement body, Expression condition) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public DoStmt(TokenRange tokenRange, Statement body, Expression condition, NodeList contracts) { + public DoStmt(TokenRange tokenRange, Statement body, Expression condition, NodeList contracts) { super(tokenRange); setBody(body); setCondition(condition); @@ -85,47 +86,49 @@ public DoStmt(TokenRange tokenRange, Statement body, Expression condition, NodeL @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getBody() { + public Statement getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCondition() { + public Expression getCondition() { return condition; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public DoStmt setBody(final Statement body) { + public DoStmt setBody(final Statement body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public DoStmt setCondition(final Expression condition) { + public DoStmt setCondition(final Expression condition) { assertNotNull(condition); if (condition == this.condition) { return this; } notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition); - if (this.condition != null) this.condition.setParentNode(null); + if (this.condition != null) + this.condition.setParentNode(null); this.condition = condition; setAsParentNodeOf(condition); return this; @@ -133,7 +136,7 @@ public DoStmt setCondition(final Expression condition) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -148,19 +151,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public DoStmt clone() { + public DoStmt clone() { return (DoStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public DoStmtMetaModel getMetaModel() { + public DoStmtMetaModel getMetaModel() { return JavaParserMetaModel.doStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -183,35 +186,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isDoStmt() { + public boolean isDoStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public DoStmt asDoStmt() { + public DoStmt asDoStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifDoStmt(Consumer action) { + public void ifDoStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toDoStmt() { + public Optional toDoStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public DoStmt setContracts(final NodeList contracts) { + public DoStmt setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java index 69dcaf706e..07382d2aba 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java @@ -37,10 +37,10 @@ * * @author Julio Vilmar Gesser */ -public class EmptyStmt extends Statement { +public class EmptyStmt extends Statement { @AllFieldsConstructor - public EmptyStmt() { + public EmptyStmt() { this(null); } @@ -48,56 +48,56 @@ public EmptyStmt() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public EmptyStmt(TokenRange tokenRange) { + public EmptyStmt(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public EmptyStmt clone() { + public EmptyStmt clone() { return (EmptyStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public EmptyStmtMetaModel getMetaModel() { + public EmptyStmtMetaModel getMetaModel() { return JavaParserMetaModel.emptyStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEmptyStmt() { + public boolean isEmptyStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EmptyStmt asEmptyStmt() { + public EmptyStmt asEmptyStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEmptyStmt(Consumer action) { + public void ifEmptyStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEmptyStmt() { + public Optional toEmptyStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java index 718dd16c9f..257c174643 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java @@ -39,10 +39,8 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -54,10 +52,7 @@ * @see com.github.javaparser.ast.expr.SuperExpr * @see com.github.javaparser.ast.expr.ThisExpr */ -public class ExplicitConstructorInvocationStmt extends Statement - implements NodeWithTypeArguments, - NodeWithArguments, - Resolvable { +public class ExplicitConstructorInvocationStmt extends Statement implements NodeWithTypeArguments, NodeWithArguments, Resolvable { @OptionalProperty private NodeList typeArguments; @@ -69,21 +64,16 @@ public class ExplicitConstructorInvocationStmt extends Statement private NodeList arguments; - public ExplicitConstructorInvocationStmt() { + public ExplicitConstructorInvocationStmt() { this(null, null, true, null, new NodeList<>()); } - public ExplicitConstructorInvocationStmt( - final boolean isThis, final Expression expression, final NodeList arguments) { + public ExplicitConstructorInvocationStmt(final boolean isThis, final Expression expression, final NodeList arguments) { this(null, null, isThis, expression, arguments); } @AllFieldsConstructor - public ExplicitConstructorInvocationStmt( - final NodeList typeArguments, - final boolean isThis, - final Expression expression, - final NodeList arguments) { + public ExplicitConstructorInvocationStmt(final NodeList typeArguments, final boolean isThis, final Expression expression, final NodeList arguments) { this(null, typeArguments, isThis, expression, arguments); } @@ -91,12 +81,7 @@ public ExplicitConstructorInvocationStmt( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ExplicitConstructorInvocationStmt( - TokenRange tokenRange, - NodeList typeArguments, - boolean isThis, - Expression expression, - NodeList arguments) { + public ExplicitConstructorInvocationStmt(TokenRange tokenRange, NodeList typeArguments, boolean isThis, Expression expression, NodeList arguments) { super(tokenRange); setTypeArguments(typeArguments); setThis(isThis); @@ -107,39 +92,40 @@ public ExplicitConstructorInvocationStmt( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getArguments() { + public NodeList getArguments() { return arguments; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getExpression() { + public Optional getExpression() { return Optional.ofNullable(expression); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isThis() { + public boolean isThis() { return isThis; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ExplicitConstructorInvocationStmt setArguments(final NodeList arguments) { + public ExplicitConstructorInvocationStmt setArguments(final NodeList arguments) { assertNotNull(arguments); if (arguments == this.arguments) { return this; } notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments); - if (this.arguments != null) this.arguments.setParentNode(null); + if (this.arguments != null) + this.arguments.setParentNode(null); this.arguments = arguments; setAsParentNodeOf(arguments); return this; @@ -152,19 +138,20 @@ public ExplicitConstructorInvocationStmt setArguments(final NodeList * @return this, the ExplicitConstructorInvocationStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ExplicitConstructorInvocationStmt setExpression(final Expression expression) { + public ExplicitConstructorInvocationStmt setExpression(final Expression expression) { if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ExplicitConstructorInvocationStmt setThis(final boolean isThis) { + public ExplicitConstructorInvocationStmt setThis(final boolean isThis) { if (isThis == this.isThis) { return this; } @@ -174,7 +161,7 @@ public ExplicitConstructorInvocationStmt setThis(final boolean isThis) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -185,12 +172,13 @@ public Optional> getTypeArguments() { * @return this, the ExplicitConstructorInvocationStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ExplicitConstructorInvocationStmt setTypeArguments(final NodeList typeArguments) { + public ExplicitConstructorInvocationStmt setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; @@ -198,7 +186,7 @@ public ExplicitConstructorInvocationStmt setTypeArguments(final NodeList t @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -226,25 +214,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ExplicitConstructorInvocationStmt removeExpression() { + public ExplicitConstructorInvocationStmt removeExpression() { return setExpression((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ExplicitConstructorInvocationStmt clone() { + public ExplicitConstructorInvocationStmt clone() { return (ExplicitConstructorInvocationStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ExplicitConstructorInvocationStmtMetaModel getMetaModel() { + public ExplicitConstructorInvocationStmtMetaModel getMetaModel() { return JavaParserMetaModel.explicitConstructorInvocationStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -273,19 +261,19 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isExplicitConstructorInvocationStmt() { + public boolean isExplicitConstructorInvocationStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ExplicitConstructorInvocationStmt asExplicitConstructorInvocationStmt() { + public ExplicitConstructorInvocationStmt asExplicitConstructorInvocationStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifExplicitConstructorInvocationStmt(Consumer action) { + public void ifExplicitConstructorInvocationStmt(Consumer action) { action.accept(this); } @@ -302,13 +290,13 @@ public void ifExplicitConstructorInvocationStmt(Consumer toExplicitConstructorInvocationStmt() { + public Optional toExplicitConstructorInvocationStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java index 0ee198eac6..0960b7491d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ExpressionStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -44,16 +42,16 @@ * * @author Julio Vilmar Gesser */ -public class ExpressionStmt extends Statement implements NodeWithExpression { +public class ExpressionStmt extends Statement implements NodeWithExpression { private Expression expression; - public ExpressionStmt() { + public ExpressionStmt() { this(null, new BooleanLiteralExpr()); } @AllFieldsConstructor - public ExpressionStmt(final Expression expression) { + public ExpressionStmt(final Expression expression) { this(null, expression); } @@ -61,7 +59,7 @@ public ExpressionStmt(final Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ExpressionStmt(TokenRange tokenRange, Expression expression) { + public ExpressionStmt(TokenRange tokenRange, Expression expression) { super(tokenRange); setExpression(expression); customInitialization(); @@ -69,29 +67,30 @@ public ExpressionStmt(TokenRange tokenRange, Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ExpressionStmt setExpression(final Expression expression) { + public ExpressionStmt setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; @@ -99,19 +98,19 @@ public ExpressionStmt setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ExpressionStmt clone() { + public ExpressionStmt clone() { return (ExpressionStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ExpressionStmtMetaModel getMetaModel() { + public ExpressionStmtMetaModel getMetaModel() { return JavaParserMetaModel.expressionStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -124,25 +123,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isExpressionStmt() { + public boolean isExpressionStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ExpressionStmt asExpressionStmt() { + public ExpressionStmt asExpressionStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifExpressionStmt(Consumer action) { + public void ifExpressionStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toExpressionStmt() { + public Optional toExpressionStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java index bcc9727c65..72b21088b3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java @@ -21,14 +21,13 @@ package com.github.javaparser.ast.stmt; import com.github.javaparser.TokenRange; -import com.github.javaparser.ast.AllFieldsConstructor; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.Modifier; -import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.*; import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.ast.expr.VariableDeclarationExpr; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.CloneVisitor; @@ -36,10 +35,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ForEachStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -49,7 +46,7 @@ * * @author Julio Vilmar Gesser */ -public class ForEachStmt extends Statement implements NodeWithBody, NodeWithContracts { +public class ForEachStmt extends Statement implements NodeWithBody, NodeWithContracts { private NodeList contracts = new NodeList<>(); @@ -59,16 +56,16 @@ public class ForEachStmt extends Statement implements NodeWithBody, private Statement body; - public ForEachStmt() { + public ForEachStmt() { this(new VariableDeclarationExpr(), new NameExpr(), new ReturnStmt()); } - public ForEachStmt(final VariableDeclarationExpr variable, final Expression iterable, final Statement body) { + public ForEachStmt(final VariableDeclarationExpr variable, final Expression iterable, final Statement body) { this(variable, iterable, body, new NodeList<>()); } @AllFieldsConstructor - public ForEachStmt(final VariableDeclarationExpr variable, final Expression iterable, final Statement body, final NodeList contracts) { + public ForEachStmt(final VariableDeclarationExpr variable, final Expression iterable, final Statement body, final NodeList contracts) { this(null, variable, iterable, body, contracts); } @@ -76,7 +73,7 @@ public ForEachStmt(final VariableDeclarationExpr variable, final Expression iter * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expression iterable, Statement body, NodeList contracts) { + public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expression iterable, Statement body, NodeList contracts) { super(tokenRange); setVariable(variable); setIterable(iterable); @@ -85,71 +82,74 @@ public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expr customInitialization(); } - public ForEachStmt(VariableDeclarationExpr variable, String iterable, BlockStmt body) { + public ForEachStmt(VariableDeclarationExpr variable, String iterable, BlockStmt body) { this(variable, new NameExpr(iterable), body); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getBody() { + public Statement getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getIterable() { + public Expression getIterable() { return iterable; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public VariableDeclarationExpr getVariable() { + public VariableDeclarationExpr getVariable() { return variable; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForEachStmt setBody(final Statement body) { + public ForEachStmt setBody(final Statement body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForEachStmt setIterable(final Expression iterable) { + public ForEachStmt setIterable(final Expression iterable) { assertNotNull(iterable); if (iterable == this.iterable) { return this; } notifyPropertyChange(ObservableProperty.ITERABLE, this.iterable, iterable); - if (this.iterable != null) this.iterable.setParentNode(null); + if (this.iterable != null) + this.iterable.setParentNode(null); this.iterable = iterable; setAsParentNodeOf(iterable); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForEachStmt setVariable(final VariableDeclarationExpr variable) { + public ForEachStmt setVariable(final VariableDeclarationExpr variable) { assertNotNull(variable); if (variable == this.variable) { return this; } notifyPropertyChange(ObservableProperty.VARIABLE, this.variable, variable); - if (this.variable != null) this.variable.setParentNode(null); + if (this.variable != null) + this.variable.setParentNode(null); this.variable = variable; setAsParentNodeOf(variable); return this; @@ -165,7 +165,7 @@ public ForEachStmt setVariable(final VariableDeclarationExpr variable) { * * @return this foreach statement's single variable declarator. */ - public VariableDeclarator getVariableDeclarator() { + public VariableDeclarator getVariableDeclarator() { return getVariable().getVariable(0); } @@ -180,14 +180,13 @@ public VariableDeclarator getVariableDeclarator() { * * @return {@code true} if this foreach statement's variable is {@code final}, and {@code false} otherwise. */ - public boolean hasFinalVariable() { - return getVariable().getModifiers().isNonEmpty() - && getVariable().getModifiers().get(0).getKeyword() == Modifier.DefaultKeyword.FINAL; + public boolean hasFinalVariable() { + return getVariable().getModifiers().isNonEmpty() && getVariable().getModifiers().get(0).getKeyword() == Modifier.DefaultKeyword.FINAL; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -202,13 +201,13 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ForEachStmt clone() { + public ForEachStmt clone() { return (ForEachStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -235,31 +234,31 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isForEachStmt() { + public boolean isForEachStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ForEachStmt asForEachStmt() { + public ForEachStmt asForEachStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toForEachStmt() { + public Optional toForEachStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifForEachStmt(Consumer action) { + public void ifForEachStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ForEachStmtMetaModel getMetaModel() { + public ForEachStmtMetaModel getMetaModel() { return JavaParserMetaModel.forEachStmtMetaModel; } @@ -267,7 +266,7 @@ public ForEachStmtMetaModel getMetaModel() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expression iterable, Statement body) { + public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expression iterable, Statement body) { super(tokenRange); setVariable(variable); setIterable(iterable); @@ -276,12 +275,12 @@ public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expr } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForEachStmt setContracts(final NodeList contracts) { + public ForEachStmt setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java index 8c24bb6273..c89b6c3b63 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java @@ -27,6 +27,8 @@ import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.BooleanLiteralExpr; import com.github.javaparser.ast.expr.Expression; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.CloneVisitor; @@ -35,10 +37,8 @@ import com.github.javaparser.metamodel.ForStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.OptionalProperty; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -68,7 +68,7 @@ * @author Julio Vilmar Gesser * @see com.github.javaparser.ast.expr.VariableDeclarationExpr */ -public class ForStmt extends Statement implements NodeWithBody, NodeWithContracts { +public class ForStmt extends Statement implements NodeWithBody, NodeWithContracts { private NodeList contracts; @@ -81,24 +81,20 @@ public class ForStmt extends Statement implements NodeWithBody, NodeWit private Statement body; - public ForStmt() { + public ForStmt() { this(new NodeList<>(), new BooleanLiteralExpr(), new NodeList<>(), new ReturnStmt()); } - public ForStmt(final NodeList initialization, final Expression compare, final NodeList update, final Statement body) { + public ForStmt(final NodeList initialization, final Expression compare, final NodeList update, final Statement body) { this(initialization, compare, update, body, new NodeList<>()); } @AllFieldsConstructor - public ForStmt( - final NodeList initialization, - final Expression compare, - final NodeList update, - final Statement body, final NodeList contracts) { + public ForStmt(final NodeList initialization, final Expression compare, final NodeList update, final Statement body, final NodeList contracts) { this(null, initialization, compare, update, body, contracts); } - public ForStmt(TokenRange tokenRange, NodeList initialization, Expression compare, NodeList update, Statement body) { + public ForStmt(TokenRange tokenRange, NodeList initialization, Expression compare, NodeList update, Statement body) { this(tokenRange, initialization, compare, update, body, new NodeList<>()); } @@ -106,12 +102,7 @@ public ForStmt(TokenRange tokenRange, NodeList initialization, Expre * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ForStmt( - TokenRange tokenRange, - NodeList initialization, - Expression compare, - NodeList update, - Statement body, NodeList contracts) { + public ForStmt(TokenRange tokenRange, NodeList initialization, Expression compare, NodeList update, Statement body, NodeList contracts) { super(tokenRange); setInitialization(initialization); setCompare(compare); @@ -123,44 +114,45 @@ public ForStmt( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getBody() { + public Statement getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getCompare() { + public Optional getCompare() { return Optional.ofNullable(compare); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getInitialization() { + public NodeList getInitialization() { return initialization; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getUpdate() { + public NodeList getUpdate() { return update; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForStmt setBody(final Statement body) { + public ForStmt setBody(final Statement body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; @@ -173,38 +165,41 @@ public ForStmt setBody(final Statement body) { * @return this, the ForStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForStmt setCompare(final Expression compare) { + public ForStmt setCompare(final Expression compare) { if (compare == this.compare) { return this; } notifyPropertyChange(ObservableProperty.COMPARE, this.compare, compare); - if (this.compare != null) this.compare.setParentNode(null); + if (this.compare != null) + this.compare.setParentNode(null); this.compare = compare; setAsParentNodeOf(compare); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForStmt setInitialization(final NodeList initialization) { + public ForStmt setInitialization(final NodeList initialization) { assertNotNull(initialization); if (initialization == this.initialization) { return this; } notifyPropertyChange(ObservableProperty.INITIALIZATION, this.initialization, initialization); - if (this.initialization != null) this.initialization.setParentNode(null); + if (this.initialization != null) + this.initialization.setParentNode(null); this.initialization = initialization; setAsParentNodeOf(initialization); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForStmt setUpdate(final NodeList update) { + public ForStmt setUpdate(final NodeList update) { assertNotNull(update); if (update == this.update) { return this; } notifyPropertyChange(ObservableProperty.UPDATE, this.update, update); - if (this.update != null) this.update.setParentNode(null); + if (this.update != null) + this.update.setParentNode(null); this.update = update; setAsParentNodeOf(update); return this; @@ -212,7 +207,7 @@ public ForStmt setUpdate(final NodeList update) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -244,25 +239,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ForStmt removeCompare() { + public ForStmt removeCompare() { return setCompare((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ForStmt clone() { + public ForStmt clone() { return (ForStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ForStmtMetaModel getMetaModel() { + public ForStmtMetaModel getMetaModel() { return JavaParserMetaModel.forStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -299,35 +294,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isForStmt() { + public boolean isForStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ForStmt asForStmt() { + public ForStmt asForStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifForStmt(Consumer action) { + public void ifForStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toForStmt() { + public Optional toForStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ForStmt setContracts(final NodeList contracts) { + public ForStmt setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java index dbdc14d811..eef2115301 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java @@ -35,10 +35,8 @@ import com.github.javaparser.metamodel.IfStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.OptionalProperty; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -48,7 +46,7 @@ * * @author Julio Vilmar Gesser */ -public class IfStmt extends Statement implements NodeWithCondition { +public class IfStmt extends Statement implements NodeWithCondition { private Expression condition; @@ -57,12 +55,12 @@ public class IfStmt extends Statement implements NodeWithCondition { @OptionalProperty private Statement elseStmt; - public IfStmt() { + public IfStmt() { this(null, new BooleanLiteralExpr(), new ReturnStmt(), null); } @AllFieldsConstructor - public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) { + public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) { this(null, condition, thenStmt, elseStmt); } @@ -70,7 +68,7 @@ public IfStmt(final Expression condition, final Statement thenStmt, final Statem * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public IfStmt(TokenRange tokenRange, Expression condition, Statement thenStmt, Statement elseStmt) { + public IfStmt(TokenRange tokenRange, Expression condition, Statement thenStmt, Statement elseStmt) { super(tokenRange); setCondition(condition); setThenStmt(thenStmt); @@ -80,39 +78,40 @@ public IfStmt(TokenRange tokenRange, Expression condition, Statement thenStmt, S @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCondition() { + public Expression getCondition() { return condition; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getElseStmt() { + public Optional getElseStmt() { return Optional.ofNullable(elseStmt); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getThenStmt() { + public Statement getThenStmt() { return thenStmt; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public IfStmt setCondition(final Expression condition) { + public IfStmt setCondition(final Expression condition) { assertNotNull(condition); if (condition == this.condition) { return this; } notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition); - if (this.condition != null) this.condition.setParentNode(null); + if (this.condition != null) + this.condition.setParentNode(null); this.condition = condition; setAsParentNodeOf(condition); return this; @@ -125,25 +124,27 @@ public IfStmt setCondition(final Expression condition) { * @return this, the IfStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public IfStmt setElseStmt(final Statement elseStmt) { + public IfStmt setElseStmt(final Statement elseStmt) { if (elseStmt == this.elseStmt) { return this; } notifyPropertyChange(ObservableProperty.ELSE_STMT, this.elseStmt, elseStmt); - if (this.elseStmt != null) this.elseStmt.setParentNode(null); + if (this.elseStmt != null) + this.elseStmt.setParentNode(null); this.elseStmt = elseStmt; setAsParentNodeOf(elseStmt); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public IfStmt setThenStmt(final Statement thenStmt) { + public IfStmt setThenStmt(final Statement thenStmt) { assertNotNull(thenStmt); if (thenStmt == this.thenStmt) { return this; } notifyPropertyChange(ObservableProperty.THEN_STMT, this.thenStmt, thenStmt); - if (this.thenStmt != null) this.thenStmt.setParentNode(null); + if (this.thenStmt != null) + this.thenStmt.setParentNode(null); this.thenStmt = thenStmt; setAsParentNodeOf(thenStmt); return this; @@ -151,7 +152,7 @@ public IfStmt setThenStmt(final Statement thenStmt) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -165,7 +166,7 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public IfStmt removeElseStmt() { + public IfStmt removeElseStmt() { return setElseStmt((Statement) null); } @@ -173,7 +174,7 @@ public IfStmt removeElseStmt() { * This method returns true if the then branch (which should be always present) is a block statement. */ @DerivedProperty - public boolean hasThenBlock() { + public boolean hasThenBlock() { return thenStmt instanceof BlockStmt; } @@ -181,7 +182,7 @@ public boolean hasThenBlock() { * This method returns true if the If Statement has an else branch and that branch is a block statement. */ @DerivedProperty - public boolean hasElseBlock() { + public boolean hasElseBlock() { return elseStmt instanceof BlockStmt; } @@ -189,7 +190,7 @@ public boolean hasElseBlock() { * This method returns true if the If Statement has an else branch and that branch is another If Statement. */ @DerivedProperty - public boolean hasCascadingIfStmt() { + public boolean hasCascadingIfStmt() { return elseStmt instanceof IfStmt; } @@ -197,25 +198,25 @@ public boolean hasCascadingIfStmt() { * This method returns true if the If Statement has an else branch. */ @DerivedProperty - public boolean hasElseBranch() { + public boolean hasElseBranch() { return elseStmt != null; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public IfStmt clone() { + public IfStmt clone() { return (IfStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public IfStmtMetaModel getMetaModel() { + public IfStmtMetaModel getMetaModel() { return JavaParserMetaModel.ifStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -238,25 +239,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIfStmt() { + public boolean isIfStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IfStmt asIfStmt() { + public IfStmt asIfStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIfStmt(Consumer action) { + public void ifIfStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIfStmt() { + public Optional toIfStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java index 818e9e7832..ac363c6068 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java @@ -31,10 +31,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.LabeledStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -42,22 +40,22 @@ * * @author Julio Vilmar Gesser */ -public class LabeledStmt extends Statement { +public class LabeledStmt extends Statement { private SimpleName label; private Statement statement; - public LabeledStmt() { + public LabeledStmt() { this(null, new SimpleName(), new ReturnStmt()); } - public LabeledStmt(final String label, final Statement statement) { + public LabeledStmt(final String label, final Statement statement) { this(null, new SimpleName(label), statement); } @AllFieldsConstructor - public LabeledStmt(final SimpleName label, final Statement statement) { + public LabeledStmt(final SimpleName label, final Statement statement) { this(null, label, statement); } @@ -65,7 +63,7 @@ public LabeledStmt(final SimpleName label, final Statement statement) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LabeledStmt(TokenRange tokenRange, SimpleName label, Statement statement) { + public LabeledStmt(TokenRange tokenRange, SimpleName label, Statement statement) { super(tokenRange); setLabel(label); setStatement(statement); @@ -74,47 +72,49 @@ public LabeledStmt(TokenRange tokenRange, SimpleName label, Statement statement) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getStatement() { + public Statement getStatement() { return statement; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LabeledStmt setStatement(final Statement statement) { + public LabeledStmt setStatement(final Statement statement) { assertNotNull(statement); if (statement == this.statement) { return this; } notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement); - if (this.statement != null) this.statement.setParentNode(null); + if (this.statement != null) + this.statement.setParentNode(null); this.statement = statement; setAsParentNodeOf(statement); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getLabel() { + public SimpleName getLabel() { return label; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LabeledStmt setLabel(final SimpleName label) { + public LabeledStmt setLabel(final SimpleName label) { assertNotNull(label); if (label == this.label) { return this; } notifyPropertyChange(ObservableProperty.LABEL, this.label, label); - if (this.label != null) this.label.setParentNode(null); + if (this.label != null) + this.label.setParentNode(null); this.label = label; setAsParentNodeOf(label); return this; @@ -122,19 +122,19 @@ public LabeledStmt setLabel(final SimpleName label) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LabeledStmt clone() { + public LabeledStmt clone() { return (LabeledStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LabeledStmtMetaModel getMetaModel() { + public LabeledStmtMetaModel getMetaModel() { return JavaParserMetaModel.labeledStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -151,25 +151,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLabeledStmt() { + public boolean isLabeledStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LabeledStmt asLabeledStmt() { + public LabeledStmt asLabeledStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLabeledStmt(Consumer action) { + public void ifLabeledStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLabeledStmt() { + public Optional toLabeledStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java index e947e2ca15..2d6eebf6af 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java @@ -31,10 +31,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.LocalClassDeclarationStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -48,16 +46,16 @@ * @author Julio Vilmar Gesser * @see ClassOrInterfaceDeclaration */ -public class LocalClassDeclarationStmt extends Statement { +public class LocalClassDeclarationStmt extends Statement { private ClassOrInterfaceDeclaration classDeclaration; - public LocalClassDeclarationStmt() { + public LocalClassDeclarationStmt() { this(null, new ClassOrInterfaceDeclaration()); } @AllFieldsConstructor - public LocalClassDeclarationStmt(final ClassOrInterfaceDeclaration classDeclaration) { + public LocalClassDeclarationStmt(final ClassOrInterfaceDeclaration classDeclaration) { this(null, classDeclaration); } @@ -65,7 +63,7 @@ public LocalClassDeclarationStmt(final ClassOrInterfaceDeclaration classDeclarat * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LocalClassDeclarationStmt(TokenRange tokenRange, ClassOrInterfaceDeclaration classDeclaration) { + public LocalClassDeclarationStmt(TokenRange tokenRange, ClassOrInterfaceDeclaration classDeclaration) { super(tokenRange); setClassDeclaration(classDeclaration); customInitialization(); @@ -73,29 +71,30 @@ public LocalClassDeclarationStmt(TokenRange tokenRange, ClassOrInterfaceDeclarat @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceDeclaration getClassDeclaration() { + public ClassOrInterfaceDeclaration getClassDeclaration() { return classDeclaration; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LocalClassDeclarationStmt setClassDeclaration(final ClassOrInterfaceDeclaration classDeclaration) { + public LocalClassDeclarationStmt setClassDeclaration(final ClassOrInterfaceDeclaration classDeclaration) { assertNotNull(classDeclaration); if (classDeclaration == this.classDeclaration) { return this; } notifyPropertyChange(ObservableProperty.CLASS_DECLARATION, this.classDeclaration, classDeclaration); - if (this.classDeclaration != null) this.classDeclaration.setParentNode(null); + if (this.classDeclaration != null) + this.classDeclaration.setParentNode(null); this.classDeclaration = classDeclaration; setAsParentNodeOf(classDeclaration); return this; @@ -103,19 +102,19 @@ public LocalClassDeclarationStmt setClassDeclaration(final ClassOrInterfaceDecla @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LocalClassDeclarationStmt clone() { + public LocalClassDeclarationStmt clone() { return (LocalClassDeclarationStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LocalClassDeclarationStmtMetaModel getMetaModel() { + public LocalClassDeclarationStmtMetaModel getMetaModel() { return JavaParserMetaModel.localClassDeclarationStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -128,25 +127,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocalClassDeclarationStmt() { + public boolean isLocalClassDeclarationStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LocalClassDeclarationStmt asLocalClassDeclarationStmt() { + public LocalClassDeclarationStmt asLocalClassDeclarationStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLocalClassDeclarationStmt(Consumer action) { + public void ifLocalClassDeclarationStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLocalClassDeclarationStmt() { + public Optional toLocalClassDeclarationStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java index 7159e26072..df7a89a210 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java @@ -31,10 +31,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.LocalRecordDeclarationStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -43,16 +41,16 @@ * @author Roger Howell * @see RecordDeclaration */ -public class LocalRecordDeclarationStmt extends Statement { +public class LocalRecordDeclarationStmt extends Statement { private RecordDeclaration recordDeclaration; - public LocalRecordDeclarationStmt() { + public LocalRecordDeclarationStmt() { this(null, new RecordDeclaration()); } @AllFieldsConstructor - public LocalRecordDeclarationStmt(final RecordDeclaration recordDeclaration) { + public LocalRecordDeclarationStmt(final RecordDeclaration recordDeclaration) { this(null, recordDeclaration); } @@ -60,7 +58,7 @@ public LocalRecordDeclarationStmt(final RecordDeclaration recordDeclaration) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public LocalRecordDeclarationStmt(TokenRange tokenRange, RecordDeclaration recordDeclaration) { + public LocalRecordDeclarationStmt(TokenRange tokenRange, RecordDeclaration recordDeclaration) { super(tokenRange); setRecordDeclaration(recordDeclaration); customInitialization(); @@ -68,29 +66,30 @@ public LocalRecordDeclarationStmt(TokenRange tokenRange, RecordDeclaration recor @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public RecordDeclaration getRecordDeclaration() { + public RecordDeclaration getRecordDeclaration() { return recordDeclaration; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public LocalRecordDeclarationStmt setRecordDeclaration(final RecordDeclaration recordDeclaration) { + public LocalRecordDeclarationStmt setRecordDeclaration(final RecordDeclaration recordDeclaration) { assertNotNull(recordDeclaration); if (recordDeclaration == this.recordDeclaration) { return this; } notifyPropertyChange(ObservableProperty.RECORD_DECLARATION, this.recordDeclaration, recordDeclaration); - if (this.recordDeclaration != null) this.recordDeclaration.setParentNode(null); + if (this.recordDeclaration != null) + this.recordDeclaration.setParentNode(null); this.recordDeclaration = recordDeclaration; setAsParentNodeOf(recordDeclaration); return this; @@ -98,19 +97,19 @@ public LocalRecordDeclarationStmt setRecordDeclaration(final RecordDeclaration r @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public LocalRecordDeclarationStmt clone() { + public LocalRecordDeclarationStmt clone() { return (LocalRecordDeclarationStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public LocalRecordDeclarationStmtMetaModel getMetaModel() { + public LocalRecordDeclarationStmtMetaModel getMetaModel() { return JavaParserMetaModel.localRecordDeclarationStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -123,25 +122,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocalRecordDeclarationStmt() { + public boolean isLocalRecordDeclarationStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LocalRecordDeclarationStmt asLocalRecordDeclarationStmt() { + public LocalRecordDeclarationStmt asLocalRecordDeclarationStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLocalRecordDeclarationStmt(Consumer action) { + public void ifLocalRecordDeclarationStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLocalRecordDeclarationStmt() { + public Optional toLocalRecordDeclarationStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java index e06df09754..50038f5753 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java @@ -42,17 +42,17 @@ * * @author Julio Vilmar Gesser */ -public class ReturnStmt extends Statement { +public class ReturnStmt extends Statement { @OptionalProperty private Expression expression; - public ReturnStmt() { + public ReturnStmt() { this(null, null); } @AllFieldsConstructor - public ReturnStmt(final Expression expression) { + public ReturnStmt(final Expression expression) { this(null, expression); } @@ -60,7 +60,7 @@ public ReturnStmt(final Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ReturnStmt(TokenRange tokenRange, Expression expression) { + public ReturnStmt(TokenRange tokenRange, Expression expression) { super(tokenRange); setExpression(expression); customInitialization(); @@ -69,24 +69,24 @@ public ReturnStmt(TokenRange tokenRange, Expression expression) { /** * Will create a NameExpr with the string param */ - public ReturnStmt(String expression) { + public ReturnStmt(String expression) { this(null, new NameExpr(expression)); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getExpression() { + public Optional getExpression() { return Optional.ofNullable(expression); } @@ -97,12 +97,13 @@ public Optional getExpression() { * @return this, the ReturnStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ReturnStmt setExpression(final Expression expression) { + public ReturnStmt setExpression(final Expression expression) { if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; @@ -110,7 +111,7 @@ public ReturnStmt setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -124,25 +125,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ReturnStmt removeExpression() { + public ReturnStmt removeExpression() { return setExpression((Expression) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ReturnStmt clone() { + public ReturnStmt clone() { return (ReturnStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ReturnStmtMetaModel getMetaModel() { + public ReturnStmtMetaModel getMetaModel() { return JavaParserMetaModel.returnStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -157,25 +158,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isReturnStmt() { + public boolean isReturnStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ReturnStmt asReturnStmt() { + public ReturnStmt asReturnStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifReturnStmt(Consumer action) { + public void ifReturnStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toReturnStmt() { + public Optional toReturnStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java index fe92e43dfc..5952c34a1b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java @@ -24,13 +24,13 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.jml.doc.JmlDocStmt; +import com.github.javaparser.ast.jml.stmt.*; import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.StatementMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.CodeGenerationUtils.f; /** @@ -41,7 +41,7 @@ public abstract class Statement extends Node { @AllFieldsConstructor - public Statement() { + public Statement() { this(null); } @@ -49,734 +49,729 @@ public Statement() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Statement(TokenRange tokenRange) { + public Statement(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Statement clone() { + public Statement clone() { return (Statement) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public StatementMetaModel getMetaModel() { + public StatementMetaModel getMetaModel() { return JavaParserMetaModel.statementMetaModel; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isAssertStmt() { + public boolean isAssertStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public AssertStmt asAssertStmt() { - throw new IllegalStateException( - f("%s is not AssertStmt, it is %s", this, this.getClass().getSimpleName())); + public AssertStmt asAssertStmt() { + throw new IllegalStateException(f("%s is not AssertStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBlockStmt() { + public boolean isBlockStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BlockStmt asBlockStmt() { - throw new IllegalStateException( - f("%s is not BlockStmt, it is %s", this, this.getClass().getSimpleName())); + public BlockStmt asBlockStmt() { + throw new IllegalStateException(f("%s is not BlockStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isBreakStmt() { + public boolean isBreakStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public BreakStmt asBreakStmt() { - throw new IllegalStateException( - f("%s is not BreakStmt, it is %s", this, this.getClass().getSimpleName())); + public BreakStmt asBreakStmt() { + throw new IllegalStateException(f("%s is not BreakStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isContinueStmt() { + public boolean isContinueStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ContinueStmt asContinueStmt() { - throw new IllegalStateException( - f("%s is not ContinueStmt, it is %s", this, this.getClass().getSimpleName())); + public ContinueStmt asContinueStmt() { + throw new IllegalStateException(f("%s is not ContinueStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isDoStmt() { + public boolean isDoStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public DoStmt asDoStmt() { - throw new IllegalStateException( - f("%s is not DoStmt, it is %s", this, this.getClass().getSimpleName())); + public DoStmt asDoStmt() { + throw new IllegalStateException(f("%s is not DoStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isEmptyStmt() { + public boolean isEmptyStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public EmptyStmt asEmptyStmt() { - throw new IllegalStateException( - f("%s is not EmptyStmt, it is %s", this, this.getClass().getSimpleName())); + public EmptyStmt asEmptyStmt() { + throw new IllegalStateException(f("%s is not EmptyStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isExplicitConstructorInvocationStmt() { + public boolean isExplicitConstructorInvocationStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ExplicitConstructorInvocationStmt asExplicitConstructorInvocationStmt() { - throw new IllegalStateException(f( - "%s is not ExplicitConstructorInvocationStmt, it is %s", - this, this.getClass().getSimpleName())); + public ExplicitConstructorInvocationStmt asExplicitConstructorInvocationStmt() { + throw new IllegalStateException(f("%s is not ExplicitConstructorInvocationStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isExpressionStmt() { + public boolean isExpressionStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ExpressionStmt asExpressionStmt() { - throw new IllegalStateException( - f("%s is not ExpressionStmt, it is %s", this, this.getClass().getSimpleName())); + public ExpressionStmt asExpressionStmt() { + throw new IllegalStateException(f("%s is not ExpressionStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isForStmt() { + public boolean isForStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ForStmt asForStmt() { - throw new IllegalStateException( - f("%s is not ForStmt, it is %s", this, this.getClass().getSimpleName())); + public ForStmt asForStmt() { + throw new IllegalStateException(f("%s is not ForStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIfStmt() { + public boolean isIfStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IfStmt asIfStmt() { - throw new IllegalStateException( - f("%s is not IfStmt, it is %s", this, this.getClass().getSimpleName())); + public IfStmt asIfStmt() { + throw new IllegalStateException(f("%s is not IfStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLabeledStmt() { + public boolean isLabeledStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LabeledStmt asLabeledStmt() { - throw new IllegalStateException( - f("%s is not LabeledStmt, it is %s", this, this.getClass().getSimpleName())); + public LabeledStmt asLabeledStmt() { + throw new IllegalStateException(f("%s is not LabeledStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocalClassDeclarationStmt() { + public boolean isLocalClassDeclarationStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isLocalRecordDeclarationStmt() { + public boolean isLocalRecordDeclarationStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LocalClassDeclarationStmt asLocalClassDeclarationStmt() { - throw new IllegalStateException(f( - "%s is not LocalClassDeclarationStmt, it is %s", - this, this.getClass().getSimpleName())); + public LocalClassDeclarationStmt asLocalClassDeclarationStmt() { + throw new IllegalStateException(f("%s is not LocalClassDeclarationStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public LocalRecordDeclarationStmt asLocalRecordDeclarationStmt() { - throw new IllegalStateException(f( - "%s is not LocalRecordDeclarationStmt, it is %s", - this, this.getClass().getSimpleName())); + public LocalRecordDeclarationStmt asLocalRecordDeclarationStmt() { + throw new IllegalStateException(f("%s is not LocalRecordDeclarationStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isReturnStmt() { + public boolean isReturnStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ReturnStmt asReturnStmt() { - throw new IllegalStateException( - f("%s is not ReturnStmt, it is %s", this, this.getClass().getSimpleName())); + public ReturnStmt asReturnStmt() { + throw new IllegalStateException(f("%s is not ReturnStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSwitchStmt() { + public boolean isSwitchStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SwitchStmt asSwitchStmt() { - throw new IllegalStateException( - f("%s is not SwitchStmt, it is %s", this, this.getClass().getSimpleName())); + public SwitchStmt asSwitchStmt() { + throw new IllegalStateException(f("%s is not SwitchStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSynchronizedStmt() { + public boolean isSynchronizedStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SynchronizedStmt asSynchronizedStmt() { - throw new IllegalStateException( - f("%s is not SynchronizedStmt, it is %s", this, this.getClass().getSimpleName())); + public SynchronizedStmt asSynchronizedStmt() { + throw new IllegalStateException(f("%s is not SynchronizedStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isThrowStmt() { + public boolean isThrowStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ThrowStmt asThrowStmt() { - throw new IllegalStateException( - f("%s is not ThrowStmt, it is %s", this, this.getClass().getSimpleName())); + public ThrowStmt asThrowStmt() { + throw new IllegalStateException(f("%s is not ThrowStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTryStmt() { + public boolean isTryStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TryStmt asTryStmt() { - throw new IllegalStateException( - f("%s is not TryStmt, it is %s", this, this.getClass().getSimpleName())); + public TryStmt asTryStmt() { + throw new IllegalStateException(f("%s is not TryStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnparsableStmt() { + public boolean isUnparsableStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnparsableStmt asUnparsableStmt() { - throw new IllegalStateException( - f("%s is not UnparsableStmt, it is %s", this, this.getClass().getSimpleName())); + public UnparsableStmt asUnparsableStmt() { + throw new IllegalStateException(f("%s is not UnparsableStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isWhileStmt() { + public boolean isWhileStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public WhileStmt asWhileStmt() { - throw new IllegalStateException( - f("%s is not WhileStmt, it is %s", this, this.getClass().getSimpleName())); + public WhileStmt asWhileStmt() { + throw new IllegalStateException(f("%s is not WhileStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifAssertStmt(Consumer action) {} + public void ifAssertStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBlockStmt(Consumer action) {} + public void ifBlockStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifBreakStmt(Consumer action) {} + public void ifBreakStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifContinueStmt(Consumer action) {} + public void ifContinueStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifDoStmt(Consumer action) {} + public void ifDoStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifEmptyStmt(Consumer action) {} + public void ifEmptyStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifExplicitConstructorInvocationStmt(Consumer action) {} + public void ifExplicitConstructorInvocationStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifExpressionStmt(Consumer action) {} + public void ifExpressionStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifForStmt(Consumer action) {} + public void ifForStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIfStmt(Consumer action) {} + public void ifIfStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLabeledStmt(Consumer action) {} + public void ifLabeledStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLocalClassDeclarationStmt(Consumer action) {} + public void ifLocalClassDeclarationStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifLocalRecordDeclarationStmt(Consumer action) {} + public void ifLocalRecordDeclarationStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifReturnStmt(Consumer action) {} + public void ifReturnStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSwitchStmt(Consumer action) {} + public void ifSwitchStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSynchronizedStmt(Consumer action) {} + public void ifSynchronizedStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifThrowStmt(Consumer action) {} + public void ifThrowStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTryStmt(Consumer action) {} + public void ifTryStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnparsableStmt(Consumer action) {} + public void ifUnparsableStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifWhileStmt(Consumer action) {} + public void ifWhileStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toAssertStmt() { + public Optional toAssertStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBlockStmt() { + public Optional toBlockStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toBreakStmt() { + public Optional toBreakStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toContinueStmt() { + public Optional toContinueStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toDoStmt() { + public Optional toDoStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toEmptyStmt() { + public Optional toEmptyStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toExplicitConstructorInvocationStmt() { + public Optional toExplicitConstructorInvocationStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toExpressionStmt() { + public Optional toExpressionStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toForStmt() { + public Optional toForStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIfStmt() { + public Optional toIfStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLabeledStmt() { + public Optional toLabeledStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLocalClassDeclarationStmt() { + public Optional toLocalClassDeclarationStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toLocalRecordDeclarationStmt() { + public Optional toLocalRecordDeclarationStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toReturnStmt() { + public Optional toReturnStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSwitchStmt() { + public Optional toSwitchStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSynchronizedStmt() { + public Optional toSynchronizedStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toThrowStmt() { + public Optional toThrowStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTryStmt() { + public Optional toTryStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnparsableStmt() { + public Optional toUnparsableStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toWhileStmt() { + public Optional toWhileStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isForEachStmt() { + public boolean isForEachStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ForEachStmt asForEachStmt() { - throw new IllegalStateException( - f("%s is not ForEachStmt, it is %s", this, this.getClass().getSimpleName())); + public ForEachStmt asForEachStmt() { + throw new IllegalStateException(f("%s is not ForEachStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toForEachStmt() { + public Optional toForEachStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifForEachStmt(Consumer action) {} + public void ifForEachStmt(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isYieldStmt() { + public boolean isYieldStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public YieldStmt asYieldStmt() { - throw new IllegalStateException( - f("%s is not YieldStmt, it is %s", this, this.getClass().getSimpleName())); + public YieldStmt asYieldStmt() { + throw new IllegalStateException(f("%s is not YieldStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toYieldStmt() { + public Optional toYieldStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifYieldStmt(Consumer action) {} - public void ifYieldStmt(Consumer action) { + public void ifYieldStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlAssertStmt() { + public boolean isJmlAssertStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlAssertStmt() { + public JmlExpressionStmt asJmlAssertStmt() { throw new IllegalStateException(f("%s is not JmlAssertStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlAssertStmt() { + public Optional toJmlAssertStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlAssertStmt(Consumer action) { + public void ifJmlAssertStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlAssumeStmt() { + public boolean isJmlAssumeStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlSetStmt() { + public boolean isJmlSetStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnreachableStmt() { + public boolean isUnreachableStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlUnreachableStmt asUnreachableStmt() { + public JmlUnreachableStmt asUnreachableStmt() { throw new IllegalStateException(f("%s is not UnreachableStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnreachableStmt() { + public Optional toUnreachableStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnreachableStmt(Consumer action) { + public void ifUnreachableStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDebugStmt() { + public boolean isJmlDebugStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlHenceByStmt() { + public boolean isJmlHenceByStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlRefiningStmt() { + public boolean isJmlRefiningStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlRefiningStmt asJmlRefiningStmt() { + public JmlRefiningStmt asJmlRefiningStmt() { throw new IllegalStateException(f("%s is not JmlRefiningStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlRefiningStmt() { + public Optional toJmlRefiningStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlRefiningStmt(Consumer action) { + public void ifJmlRefiningStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlStatement() { + public boolean isJmlStatement() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlStatement asJmlStatement() { + public JmlStatement asJmlStatement() { throw new IllegalStateException(f("%s is not JmlStatement, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlStatement() { + public Optional toJmlStatement() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlStatement(Consumer action) { + public void ifJmlStatement(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlStatements() { + public boolean isJmlStatements() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlUnreachableStmt() { + public boolean isJmlUnreachableStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlUnreachableStmt asJmlUnreachableStmt() { + public JmlUnreachableStmt asJmlUnreachableStmt() { throw new IllegalStateException(f("%s is not JmlUnreachableStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlUnreachableStmt() { + public Optional toJmlUnreachableStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlUnreachableStmt(Consumer action) { + public void ifJmlUnreachableStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlStmtWithExpression() { + public boolean isJmlStmtWithExpression() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlStmtWithExpression() { + public JmlExpressionStmt asJmlStmtWithExpression() { throw new IllegalStateException(f("%s is not JmlStmtWithExpression, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlStmtWithExpression() { + public Optional toJmlStmtWithExpression() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlStmtWithExpression(Consumer action) { + public void ifJmlStmtWithExpression(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlGhostStatements() { + public boolean isJmlGhostStatements() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlGhostStmt asJmlGhostStatements() { + public JmlGhostStmt asJmlGhostStatements() { throw new IllegalStateException(f("%s is not JmlGhostStatements, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlGhostStatements() { + public Optional toJmlGhostStatements() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlGhostStatements(Consumer action) { + public void ifJmlGhostStatements(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlDocStmt() { + public boolean isJmlDocStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlDocStmt asJmlDocStmt() { + public JmlDocStmt asJmlDocStmt() { throw new IllegalStateException(f("%s is not JmlDocStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlDocStmt() { + public Optional toJmlDocStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlDocStmt(Consumer action) { + public void ifJmlDocStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlGhostStatement() { + public boolean isJmlGhostStatement() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlGhostStmt asJmlGhostStatement() { + public JmlGhostStmt asJmlGhostStatement() { throw new IllegalStateException(f("%s is not JmlGhostStatement, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlGhostStatement() { + public Optional toJmlGhostStatement() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlGhostStatement(Consumer action) { + public void ifJmlGhostStatement(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlBeginStmt() { + public boolean isJmlBeginStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlBeginStmt asJmlBeginStmt() { + public JmlBeginStmt asJmlBeginStmt() { throw new IllegalStateException(f("%s is not JmlBeginStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlBeginStmt() { + public Optional toJmlBeginStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlBeginStmt(Consumer action) { + public void ifJmlBeginStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlEndStmt() { + public boolean isJmlEndStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlEndStmt asJmlEndStmt() { + public JmlEndStmt asJmlEndStmt() { throw new IllegalStateException(f("%s is not JmlEndStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlEndStmt() { + public Optional toJmlEndStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlEndStmt(Consumer action) { + public void ifJmlEndStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlExpressionStmt() { + public boolean isJmlExpressionStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlExpressionStmt asJmlExpressionStmt() { + public JmlExpressionStmt asJmlExpressionStmt() { throw new IllegalStateException(f("%s is not JmlExpressionStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlExpressionStmt() { + public Optional toJmlExpressionStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlExpressionStmt(Consumer action) { + public void ifJmlExpressionStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlGhostStmt() { + public boolean isJmlGhostStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlGhostStmt asJmlGhostStmt() { + public JmlGhostStmt asJmlGhostStmt() { throw new IllegalStateException(f("%s is not JmlGhostStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlGhostStmt() { + public Optional toJmlGhostStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlGhostStmt(Consumer action) { + public void ifJmlGhostStmt(Consumer action) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isJmlLabelStmt() { + public boolean isJmlLabelStmt() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public JmlLabelStmt asJmlLabelStmt() { + public JmlLabelStmt asJmlLabelStmt() { throw new IllegalStateException(f("%s is not JmlLabelStmt, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toJmlLabelStmt() { + public Optional toJmlLabelStmt() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifJmlLabelStmt(Consumer action) { + public void ifJmlLabelStmt(Consumer action) { } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java index 11c3e1e3c9..72f90539ae 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java @@ -31,9 +31,11 @@ import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; +import com.github.javaparser.metamodel.DerivedProperty; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.SwitchEntryMetaModel; - +import java.util.Optional; import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -82,13 +84,11 @@ * @see SwitchStmt * @see com.github.javaparser.ast.expr.SwitchExpr */ -public class SwitchEntry extends Node implements NodeWithStatements { +public class SwitchEntry extends Node implements NodeWithStatements { + + public enum Type { - public enum Type { - STATEMENT_GROUP, - EXPRESSION, - BLOCK, - THROWS_STATEMENT + STATEMENT_GROUP, EXPRESSION, BLOCK, THROWS_STATEMENT } private NodeList labels; @@ -102,7 +102,7 @@ public enum Type { @OptionalProperty private Expression guard; - public SwitchEntry() { + public SwitchEntry() { this(null, new NodeList(), Type.STATEMENT_GROUP, new NodeList<>(), false, null); } @@ -110,11 +110,7 @@ public SwitchEntry() { * This constructor exists for backwards compatibility for code that instantiated `SwitchEntries` before * the `isDefault` and guard fields were added. */ - public SwitchEntry( - final TokenRange tokenRange, - final NodeList labels, - final Type type, - final NodeList statements) { + public SwitchEntry(final TokenRange tokenRange, final NodeList labels, final Type type, final NodeList statements) { this(tokenRange, labels, type, statements, false, null); } @@ -122,16 +118,12 @@ public SwitchEntry( * This constructor exists for backwards compatibility for code that instantiated `SwitchEntries` before * the `isDefault` and guard fields were added. */ - public SwitchEntry(final NodeList labels, final Type type, final NodeList statements) { + public SwitchEntry(final NodeList labels, final Type type, final NodeList statements) { this(null, labels, type, statements, false, null); } @AllFieldsConstructor - public SwitchEntry( - final NodeList labels, - final Type type, - final NodeList statements, - final boolean isDefault) { + public SwitchEntry(final NodeList labels, final Type type, final NodeList statements, final boolean isDefault) { this(null, labels, type, statements, isDefault, null); } @@ -139,13 +131,7 @@ public SwitchEntry( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SwitchEntry( - TokenRange tokenRange, - NodeList labels, - Type type, - NodeList statements, - boolean isDefault, - Expression guard) { + public SwitchEntry(TokenRange tokenRange, NodeList labels, Type type, NodeList statements, boolean isDefault, Expression guard) { super(tokenRange); setLabels(labels); setType(type); @@ -164,29 +150,29 @@ public SwitchEntry( * are for the various switch expressions. */ @DerivedProperty - public boolean isSwitchStatementEntry() { + public boolean isSwitchStatementEntry() { return type == Type.STATEMENT_GROUP; } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getLabels() { + public NodeList getLabels() { return labels; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getStatements() { + public NodeList getStatements() { return statements; } @@ -197,26 +183,28 @@ public NodeList getStatements() { * @return this, the SwitchEntry */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchEntry setLabels(final NodeList labels) { + public SwitchEntry setLabels(final NodeList labels) { assertNotNull(labels); if (labels == this.labels) { return this; } notifyPropertyChange(ObservableProperty.LABELS, this.labels, labels); - if (this.labels != null) this.labels.setParentNode(null); + if (this.labels != null) + this.labels.setParentNode(null); this.labels = labels; setAsParentNodeOf(labels); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchEntry setStatements(final NodeList statements) { + public SwitchEntry setStatements(final NodeList statements) { assertNotNull(statements); if (statements == this.statements) { return this; } notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements); - if (this.statements != null) this.statements.setParentNode(null); + if (this.statements != null) + this.statements.setParentNode(null); this.statements = statements; setAsParentNodeOf(statements); return this; @@ -224,7 +212,7 @@ public SwitchEntry setStatements(final NodeList statements) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -251,23 +239,23 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SwitchEntry clone() { + public SwitchEntry clone() { return (SwitchEntry) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SwitchEntryMetaModel getMetaModel() { + public SwitchEntryMetaModel getMetaModel() { return JavaParserMetaModel.switchEntryMetaModel; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getType() { + public Type getType() { return type; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchEntry setType(final Type type) { + public SwitchEntry setType(final Type type) { assertNotNull(type); if (type == this.type) { return this; @@ -279,7 +267,7 @@ public SwitchEntry setType(final Type type) { @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -305,12 +293,12 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public boolean isDefault() { + public boolean isDefault() { return isDefault; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchEntry setDefault(final boolean isDefault) { + public SwitchEntry setDefault(final boolean isDefault) { if (isDefault == this.isDefault) { return this; } @@ -320,24 +308,25 @@ public SwitchEntry setDefault(final boolean isDefault) { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getGuard() { + public Optional getGuard() { return Optional.ofNullable(guard); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchEntry setGuard(final Expression guard) { + public SwitchEntry setGuard(final Expression guard) { if (guard == this.guard) { return this; } notifyPropertyChange(ObservableProperty.GUARD, this.guard, guard); - if (this.guard != null) this.guard.setParentNode(null); + if (this.guard != null) + this.guard.setParentNode(null); this.guard = guard; setAsParentNodeOf(guard); return this; } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public SwitchEntry removeGuard() { + public SwitchEntry removeGuard() { return setGuard((Expression) null); } @@ -345,12 +334,7 @@ public SwitchEntry removeGuard() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SwitchEntry( - TokenRange tokenRange, - NodeList labels, - Type type, - NodeList statements, - boolean isDefault) { + public SwitchEntry(TokenRange tokenRange, NodeList labels, Type type, NodeList statements, boolean isDefault) { super(tokenRange); setLabels(labels); setType(type); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java index 770983ebc0..f9e2b63da6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java @@ -34,10 +34,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.SwitchStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -77,18 +75,18 @@ * @see BreakStmt * @see YieldStmt */ -public class SwitchStmt extends Statement implements SwitchNode { +public class SwitchStmt extends Statement implements SwitchNode { private Expression selector; private NodeList entries; - public SwitchStmt() { + public SwitchStmt() { this(null, new NameExpr(), new NodeList<>()); } @AllFieldsConstructor - public SwitchStmt(final Expression selector, final NodeList entries) { + public SwitchStmt(final Expression selector, final NodeList entries) { this(null, selector, entries); } @@ -96,7 +94,7 @@ public SwitchStmt(final Expression selector, final NodeList entries * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SwitchStmt(TokenRange tokenRange, Expression selector, NodeList entries) { + public SwitchStmt(TokenRange tokenRange, Expression selector, NodeList entries) { super(tokenRange); setSelector(selector); setEntries(entries); @@ -105,51 +103,53 @@ public SwitchStmt(TokenRange tokenRange, Expression selector, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getEntries() { + public NodeList getEntries() { return entries; } - public SwitchEntry getEntry(int i) { + public SwitchEntry getEntry(int i) { return getEntries().get(i); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getSelector() { + public Expression getSelector() { return selector; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchStmt setEntries(final NodeList entries) { + public SwitchStmt setEntries(final NodeList entries) { assertNotNull(entries); if (entries == this.entries) { return this; } notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries); - if (this.entries != null) this.entries.setParentNode(null); + if (this.entries != null) + this.entries.setParentNode(null); this.entries = entries; setAsParentNodeOf(entries); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SwitchStmt setSelector(final Expression selector) { + public SwitchStmt setSelector(final Expression selector) { assertNotNull(selector); if (selector == this.selector) { return this; } notifyPropertyChange(ObservableProperty.SELECTOR, this.selector, selector); - if (this.selector != null) this.selector.setParentNode(null); + if (this.selector != null) + this.selector.setParentNode(null); this.selector = selector; setAsParentNodeOf(selector); return this; @@ -157,7 +157,7 @@ public SwitchStmt setSelector(final Expression selector) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -172,19 +172,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SwitchStmt clone() { + public SwitchStmt clone() { return (SwitchStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SwitchStmtMetaModel getMetaModel() { + public SwitchStmtMetaModel getMetaModel() { return JavaParserMetaModel.switchStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -203,25 +203,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSwitchStmt() { + public boolean isSwitchStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SwitchStmt asSwitchStmt() { + public SwitchStmt asSwitchStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSwitchStmt(Consumer action) { + public void ifSwitchStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSwitchStmt() { + public Optional toSwitchStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java index 86577ae98c..154c6ce4cb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java @@ -34,10 +34,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.SynchronizedStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -46,19 +44,18 @@ * * @author Julio Vilmar Gesser */ -public class SynchronizedStmt extends Statement - implements NodeWithBlockStmt, NodeWithExpression { +public class SynchronizedStmt extends Statement implements NodeWithBlockStmt, NodeWithExpression { private Expression expression; private BlockStmt body; - public SynchronizedStmt() { + public SynchronizedStmt() { this(null, new NameExpr(), new BlockStmt()); } @AllFieldsConstructor - public SynchronizedStmt(final Expression expression, final BlockStmt body) { + public SynchronizedStmt(final Expression expression, final BlockStmt body) { this(null, expression, body); } @@ -66,7 +63,7 @@ public SynchronizedStmt(final Expression expression, final BlockStmt body) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public SynchronizedStmt(TokenRange tokenRange, Expression expression, BlockStmt body) { + public SynchronizedStmt(TokenRange tokenRange, Expression expression, BlockStmt body) { super(tokenRange); setExpression(expression); setBody(body); @@ -75,47 +72,49 @@ public SynchronizedStmt(TokenRange tokenRange, Expression expression, BlockStmt @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SynchronizedStmt setExpression(final Expression expression) { + public SynchronizedStmt setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getBody() { + public BlockStmt getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SynchronizedStmt setBody(final BlockStmt body) { + public SynchronizedStmt setBody(final BlockStmt body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; @@ -123,19 +122,19 @@ public SynchronizedStmt setBody(final BlockStmt body) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public SynchronizedStmt clone() { + public SynchronizedStmt clone() { return (SynchronizedStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public SynchronizedStmtMetaModel getMetaModel() { + public SynchronizedStmtMetaModel getMetaModel() { return JavaParserMetaModel.synchronizedStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -152,25 +151,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isSynchronizedStmt() { + public boolean isSynchronizedStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public SynchronizedStmt asSynchronizedStmt() { + public SynchronizedStmt asSynchronizedStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifSynchronizedStmt(Consumer action) { + public void ifSynchronizedStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toSynchronizedStmt() { + public Optional toSynchronizedStmt() { return Optional.of(this); } } 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 c4060ff5de..292e7d7430 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 @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.ThrowStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -45,16 +43,16 @@ * * @author Julio Vilmar Gesser */ -public class ThrowStmt extends Statement implements NodeWithExpression { +public class ThrowStmt extends Statement implements NodeWithExpression { private Expression expression; - public ThrowStmt() { + public ThrowStmt() { this(null, new NameExpr()); } @AllFieldsConstructor - public ThrowStmt(final Expression expression) { + public ThrowStmt(final Expression expression) { this(null, expression); } @@ -62,7 +60,7 @@ public ThrowStmt(final Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ThrowStmt(TokenRange tokenRange, Expression expression) { + public ThrowStmt(TokenRange tokenRange, Expression expression) { super(tokenRange); setExpression(expression); customInitialization(); @@ -70,29 +68,30 @@ public ThrowStmt(TokenRange tokenRange, Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ThrowStmt setExpression(final Expression expression) { + public ThrowStmt setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; @@ -100,19 +99,19 @@ public ThrowStmt setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ThrowStmt clone() { + public ThrowStmt clone() { return (ThrowStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ThrowStmtMetaModel getMetaModel() { + public ThrowStmtMetaModel getMetaModel() { return JavaParserMetaModel.throwStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -125,25 +124,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isThrowStmt() { + public boolean isThrowStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ThrowStmt asThrowStmt() { + public ThrowStmt asThrowStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifThrowStmt(Consumer action) { + public void ifThrowStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toThrowStmt() { + public Optional toThrowStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java index 612f3716e6..806ee9c82b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java @@ -33,10 +33,8 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.TryStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -94,7 +92,7 @@ * @see com.github.javaparser.ast.expr.FieldAccessExpr * @see com.github.javaparser.ast.expr.NameExpr */ -public class TryStmt extends Statement { +public class TryStmt extends Statement { private NodeList resources; @@ -105,20 +103,16 @@ public class TryStmt extends Statement { @OptionalProperty private BlockStmt finallyBlock; - public TryStmt() { + public TryStmt() { this(null, new NodeList<>(), new BlockStmt(), new NodeList<>(), null); } - public TryStmt(final BlockStmt tryBlock, final NodeList catchClauses, final BlockStmt finallyBlock) { + public TryStmt(final BlockStmt tryBlock, final NodeList catchClauses, final BlockStmt finallyBlock) { this(null, new NodeList<>(), tryBlock, catchClauses, finallyBlock); } @AllFieldsConstructor - public TryStmt( - NodeList resources, - final BlockStmt tryBlock, - final NodeList catchClauses, - final BlockStmt finallyBlock) { + public TryStmt(NodeList resources, final BlockStmt tryBlock, final NodeList catchClauses, final BlockStmt finallyBlock) { this(null, resources, tryBlock, catchClauses, finallyBlock); } @@ -126,12 +120,7 @@ public TryStmt( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TryStmt( - TokenRange tokenRange, - NodeList resources, - BlockStmt tryBlock, - NodeList catchClauses, - BlockStmt finallyBlock) { + public TryStmt(TokenRange tokenRange, NodeList resources, BlockStmt tryBlock, NodeList catchClauses, BlockStmt finallyBlock) { super(tokenRange); setResources(resources); setTryBlock(tryBlock); @@ -142,82 +131,86 @@ public TryStmt( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getCatchClauses() { + public NodeList getCatchClauses() { return catchClauses; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getFinallyBlock() { + public Optional getFinallyBlock() { return Optional.ofNullable(finallyBlock); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public BlockStmt getTryBlock() { + public BlockStmt getTryBlock() { return tryBlock; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getResources() { + public NodeList getResources() { return resources; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TryStmt setCatchClauses(final NodeList catchClauses) { + public TryStmt setCatchClauses(final NodeList catchClauses) { assertNotNull(catchClauses); if (catchClauses == this.catchClauses) { return this; } notifyPropertyChange(ObservableProperty.CATCH_CLAUSES, this.catchClauses, catchClauses); - if (this.catchClauses != null) this.catchClauses.setParentNode(null); + if (this.catchClauses != null) + this.catchClauses.setParentNode(null); this.catchClauses = catchClauses; setAsParentNodeOf(catchClauses); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TryStmt setFinallyBlock(final BlockStmt finallyBlock) { + public TryStmt setFinallyBlock(final BlockStmt finallyBlock) { if (finallyBlock == this.finallyBlock) { return this; } notifyPropertyChange(ObservableProperty.FINALLY_BLOCK, this.finallyBlock, finallyBlock); - if (this.finallyBlock != null) this.finallyBlock.setParentNode(null); + if (this.finallyBlock != null) + this.finallyBlock.setParentNode(null); this.finallyBlock = finallyBlock; setAsParentNodeOf(finallyBlock); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TryStmt setTryBlock(final BlockStmt tryBlock) { + public TryStmt setTryBlock(final BlockStmt tryBlock) { assertNotNull(tryBlock); if (tryBlock == this.tryBlock) { return this; } notifyPropertyChange(ObservableProperty.TRY_BLOCK, this.tryBlock, tryBlock); - if (this.tryBlock != null) this.tryBlock.setParentNode(null); + if (this.tryBlock != null) + this.tryBlock.setParentNode(null); this.tryBlock = tryBlock; setAsParentNodeOf(tryBlock); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TryStmt setResources(final NodeList resources) { + public TryStmt setResources(final NodeList resources) { assertNotNull(resources); if (resources == this.resources) { return this; } notifyPropertyChange(ObservableProperty.RESOURCES, this.resources, resources); - if (this.resources != null) this.resources.setParentNode(null); + if (this.resources != null) + this.resources.setParentNode(null); this.resources = resources; setAsParentNodeOf(resources); return this; @@ -225,7 +218,7 @@ public TryStmt setResources(final NodeList resources) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -251,25 +244,25 @@ public boolean remove(Node node) { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public TryStmt removeFinallyBlock() { + public TryStmt removeFinallyBlock() { return setFinallyBlock((BlockStmt) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TryStmt clone() { + public TryStmt clone() { return (TryStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TryStmtMetaModel getMetaModel() { + public TryStmtMetaModel getMetaModel() { return JavaParserMetaModel.tryStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -300,25 +293,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTryStmt() { + public boolean isTryStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TryStmt asTryStmt() { + public TryStmt asTryStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTryStmt(Consumer action) { + public void ifTryStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTryStmt() { + public Optional toTryStmt() { return Optional.of(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java index df64347a57..a68c0af396 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.stmt; import static com.github.javaparser.ast.Node.Parsedness.UNPARSABLE; - import com.github.javaparser.TokenRange; import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; @@ -32,15 +31,16 @@ import com.github.javaparser.metamodel.UnparsableStmtMetaModel; import java.util.Optional; import java.util.function.Consumer; +import com.github.javaparser.ast.Node; /** * A statement that had parse errors. * Nothing is known about it except the tokens it covers. */ -public class UnparsableStmt extends Statement { +public class UnparsableStmt extends Statement { @AllFieldsConstructor - public UnparsableStmt() { + public UnparsableStmt() { this(null); } @@ -48,61 +48,61 @@ public UnparsableStmt() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public UnparsableStmt(TokenRange tokenRange) { + public UnparsableStmt(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public UnparsableStmt clone() { + public UnparsableStmt clone() { return (UnparsableStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public UnparsableStmtMetaModel getMetaModel() { + public UnparsableStmtMetaModel getMetaModel() { return JavaParserMetaModel.unparsableStmtMetaModel; } @Override - public Parsedness getParsed() { + public Parsedness getParsed() { return UNPARSABLE; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnparsableStmt() { + public boolean isUnparsableStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnparsableStmt asUnparsableStmt() { + public UnparsableStmt asUnparsableStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnparsableStmt(Consumer action) { + public void ifUnparsableStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnparsableStmt() { + public Optional toUnparsableStmt() { return Optional.of(this); } } 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 b3fe777049..8ccca9c086 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 @@ -24,8 +24,11 @@ import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.BooleanLiteralExpr; import com.github.javaparser.ast.expr.Expression; +import com.github.javaparser.ast.jml.NodeWithContracts; +import com.github.javaparser.ast.jml.clauses.JmlContract; import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.nodeTypes.NodeWithCondition; import com.github.javaparser.ast.observer.ObservableProperty; @@ -34,10 +37,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.WhileStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -46,7 +47,7 @@ * * @author Julio Vilmar Gesser */ -public class WhileStmt extends Statement implements NodeWithBody, NodeWithCondition, NodeWithContracts { +public class WhileStmt extends Statement implements NodeWithBody, NodeWithCondition, NodeWithContracts { private NodeList contracts; @@ -54,20 +55,20 @@ public class WhileStmt extends Statement implements NodeWithBody, Nod private Statement body; - public WhileStmt() { + public WhileStmt() { this(new BooleanLiteralExpr(), new ReturnStmt()); } - public WhileStmt(final Expression condition, final Statement body) { + public WhileStmt(final Expression condition, final Statement body) { this(condition, body, new NodeList<>()); } @AllFieldsConstructor - public WhileStmt(final Expression condition, final Statement body, final NodeList contracts) { + public WhileStmt(final Expression condition, final Statement body, final NodeList contracts) { this(null, condition, body, contracts); } - public WhileStmt(TokenRange tokenRange, Expression condition, Statement body) { + public WhileStmt(TokenRange tokenRange, Expression condition, Statement body) { this(tokenRange, condition, body, new NodeList<>()); } @@ -75,7 +76,7 @@ public WhileStmt(TokenRange tokenRange, Expression condition, Statement body) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public WhileStmt(TokenRange tokenRange, Expression condition, Statement body, NodeList contracts) { + public WhileStmt(TokenRange tokenRange, Expression condition, Statement body, NodeList contracts) { super(tokenRange); setCondition(condition); setBody(body); @@ -85,47 +86,49 @@ public WhileStmt(TokenRange tokenRange, Expression condition, Statement body, No @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Statement getBody() { + public Statement getBody() { return body; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getCondition() { + public Expression getCondition() { return condition; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public WhileStmt setBody(final Statement body) { + public WhileStmt setBody(final Statement body) { assertNotNull(body); if (body == this.body) { return this; } notifyPropertyChange(ObservableProperty.BODY, this.body, body); - if (this.body != null) this.body.setParentNode(null); + if (this.body != null) + this.body.setParentNode(null); this.body = body; setAsParentNodeOf(body); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public WhileStmt setCondition(final Expression condition) { + public WhileStmt setCondition(final Expression condition) { assertNotNull(condition); if (condition == this.condition) { return this; } notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition); - if (this.condition != null) this.condition.setParentNode(null); + if (this.condition != null) + this.condition.setParentNode(null); this.condition = condition; setAsParentNodeOf(condition); return this; @@ -133,7 +136,7 @@ public WhileStmt setCondition(final Expression condition) { @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -148,19 +151,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public WhileStmt clone() { + public WhileStmt clone() { return (WhileStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public WhileStmtMetaModel getMetaModel() { + public WhileStmtMetaModel getMetaModel() { return JavaParserMetaModel.whileStmtMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -183,35 +186,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isWhileStmt() { + public boolean isWhileStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public WhileStmt asWhileStmt() { + public WhileStmt asWhileStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifWhileStmt(Consumer action) { + public void ifWhileStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toWhileStmt() { + public Optional toWhileStmt() { return Optional.of(this); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getContracts() { + public NodeList getContracts() { return contracts; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public WhileStmt setContracts(final NodeList contracts) { + public WhileStmt setContracts(final NodeList contracts) { assertNotNull(contracts); if (contracts == this.contracts) { return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java index d1a316408b..852b0e0f16 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java @@ -33,10 +33,8 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.YieldStmtMetaModel; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -48,16 +46,16 @@ *
{@code yield 123+456;} *
{@code yield "more or less";} */ -public class YieldStmt extends Statement implements NodeWithExpression { +public class YieldStmt extends Statement implements NodeWithExpression { private Expression expression; - public YieldStmt() { + public YieldStmt() { this(null, new NameExpr()); } @AllFieldsConstructor - public YieldStmt(final Expression expression) { + public YieldStmt(final Expression expression) { this(null, expression); } @@ -65,14 +63,14 @@ public YieldStmt(final Expression expression) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public YieldStmt(TokenRange tokenRange, Expression expression) { + public YieldStmt(TokenRange tokenRange, Expression expression) { super(tokenRange); setExpression(expression); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Expression getExpression() { + public Expression getExpression() { return expression; } @@ -83,13 +81,14 @@ public Expression getExpression() { * @return this, the YieldStmt */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public YieldStmt setExpression(final Expression expression) { + public YieldStmt setExpression(final Expression expression) { assertNotNull(expression); if (expression == this.expression) { return this; } notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression); - if (this.expression != null) this.expression.setParentNode(null); + if (this.expression != null) + this.expression.setParentNode(null); this.expression = expression; setAsParentNodeOf(expression); return this; @@ -97,43 +96,43 @@ public YieldStmt setExpression(final Expression expression) { @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isYieldStmt() { + public boolean isYieldStmt() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public YieldStmt asYieldStmt() { + public YieldStmt asYieldStmt() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toYieldStmt() { + public Optional toYieldStmt() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifYieldStmt(Consumer action) { + public void ifYieldStmt(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -146,13 +145,13 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public YieldStmt clone() { + public YieldStmt clone() { return (YieldStmt) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public YieldStmtMetaModel getMetaModel() { + public YieldStmtMetaModel getMetaModel() { return JavaParserMetaModel.yieldStmtMetaModel; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java index f3ff7dcd57..12192796b9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java @@ -37,12 +37,10 @@ import com.github.javaparser.resolution.types.ResolvedArrayType; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.utils.Pair; - import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.ast.NodeList.nodeList; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -50,17 +48,17 @@ * To indicate that a type is an array, it gets wrapped in an ArrayType for every array level it has. * So, int[][] becomes ArrayType(ArrayType(int)). */ -public class ArrayType extends ReferenceType implements NodeWithAnnotations { +public class ArrayType extends ReferenceType implements NodeWithAnnotations { @Override - public ResolvedArrayType resolve() { + public ResolvedArrayType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedArrayType.class); } /** * The origin of a pair of array brackets []. */ - public enum Origin { + public enum Origin { /** * The [] were found on the name, like "int a[]" or "String abc()[][]" @@ -77,11 +75,11 @@ public enum Origin { private Origin origin; @AllFieldsConstructor - public ArrayType(Type componentType, Origin origin, NodeList annotations) { + public ArrayType(Type componentType, Origin origin, NodeList annotations) { this(null, componentType, origin, annotations); } - public ArrayType(Type type, AnnotationExpr... annotations) { + public ArrayType(Type type, AnnotationExpr... annotations) { this(type, Origin.TYPE, nodeList(annotations)); } @@ -89,7 +87,7 @@ public ArrayType(Type type, AnnotationExpr... annotations) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ArrayType(TokenRange tokenRange, Type componentType, Origin origin, NodeList annotations) { + public ArrayType(TokenRange tokenRange, Type componentType, Origin origin, NodeList annotations) { super(tokenRange, annotations); setComponentType(componentType); setOrigin(origin); @@ -98,29 +96,30 @@ public ArrayType(TokenRange tokenRange, Type componentType, Origin origin, NodeL @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type getComponentType() { + public Type getComponentType() { return componentType; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayType setComponentType(final Type componentType) { + public ArrayType setComponentType(final Type componentType) { assertNotNull(componentType); if (componentType == this.componentType) { return this; } notifyPropertyChange(ObservableProperty.COMPONENT_TYPE, this.componentType, componentType); - if (this.componentType != null) this.componentType.setParentNode(null); + if (this.componentType != null) + this.componentType.setParentNode(null); this.componentType = componentType; setAsParentNodeOf(componentType); return this; @@ -140,9 +139,7 @@ public static Type wrapInArrayTypes(Type type, List... arrayBr for (int j = arrayBracketPairList.size() - 1; j >= 0; j--) { ArrayBracketPair pair = arrayBracketPairList.get(j); if (type.getTokenRange().isPresent() && pair.getTokenRange().isPresent()) { - TokenRange currentTokenRange = new TokenRange( - type.getTokenRange().get().getBegin(), - pair.getTokenRange().get().getEnd()); + TokenRange currentTokenRange = new TokenRange(type.getTokenRange().get().getBegin(), pair.getTokenRange().get().getEnd()); // The end range must be equals to the last array bracket pair in the list // in the example below: // Long[][] @@ -162,12 +159,9 @@ public static Type wrapInArrayTypes(Type type, List... arrayBr * Returns a {@code TokenRange} with the outermost ending token */ private static TokenRange getOuterMostTokenRange(TokenRange tokenRange1, TokenRange tokenRange2) { - if (tokenRange2 == null) return tokenRange1; - if (tokenRange1 - .getEnd() - .getRange() - .get() - .isAfter(tokenRange2.getEnd().getRange().get())) { + if (tokenRange2 == null) + return tokenRange1; + if (tokenRange1.getEnd().getRange().get().isAfter(tokenRange2.getEnd().getRange().get())) { return tokenRange1; } return new TokenRange(tokenRange1.getBegin(), tokenRange2.getEnd()); @@ -182,8 +176,7 @@ public static Pair> unwrapArrayTypes(Type type) { final List arrayBracketPairs = new ArrayList<>(0); while (type instanceof ArrayType) { ArrayType arrayType = (ArrayType) type; - arrayBracketPairs.add(new ArrayBracketPair( - type.getTokenRange().orElse(null), arrayType.getOrigin(), arrayType.getAnnotations())); + arrayBracketPairs.add(new ArrayBracketPair(type.getTokenRange().orElse(null), arrayType.getOrigin(), arrayType.getAnnotations())); type = arrayType.getComponentType(); } return new Pair<>(type, arrayBracketPairs); @@ -201,52 +194,52 @@ public static class ArrayBracketPair { private Origin origin; - public ArrayBracketPair(TokenRange tokenRange, Origin origin, NodeList annotations) { + public ArrayBracketPair(TokenRange tokenRange, Origin origin, NodeList annotations) { setTokenRange(tokenRange); setAnnotations(annotations); setOrigin(origin); } - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } - public ArrayBracketPair setAnnotations(NodeList annotations) { + public ArrayBracketPair setAnnotations(NodeList annotations) { this.annotations = assertNotNull(annotations); return this; } - public ArrayBracketPair setTokenRange(TokenRange range) { + public ArrayBracketPair setTokenRange(TokenRange range) { this.tokenRange = range; return this; } - public Optional getTokenRange() { + public Optional getTokenRange() { return Optional.ofNullable(tokenRange); } - public Origin getOrigin() { + public Origin getOrigin() { return origin; } - public ArrayBracketPair setOrigin(Origin origin) { + public ArrayBracketPair setOrigin(Origin origin) { this.origin = assertNotNull(origin); return this; } } @Override - public ArrayType setAnnotations(NodeList annotations) { + public ArrayType setAnnotations(NodeList annotations) { return (ArrayType) super.setAnnotations(annotations); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Origin getOrigin() { + public Origin getOrigin() { return origin; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ArrayType setOrigin(final Origin origin) { + public ArrayType setOrigin(final Origin origin) { assertNotNull(origin); if (origin == this.origin) { return this; @@ -257,12 +250,12 @@ public ArrayType setOrigin(final Origin origin) { } @Override - public String asString() { + public String asString() { return componentType.asString() + "[]"; } @Override - public String toDescriptor() { + public String toDescriptor() { StringBuffer sb = new StringBuffer(); sb.append("["); sb.append(componentType.toDescriptor()); @@ -271,19 +264,19 @@ public String toDescriptor() { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ArrayType clone() { + public ArrayType clone() { return (ArrayType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ArrayTypeMetaModel getMetaModel() { + public ArrayTypeMetaModel getMetaModel() { return JavaParserMetaModel.arrayTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -296,25 +289,25 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayType() { + public boolean isArrayType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayType asArrayType() { + public ArrayType asArrayType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayType(Consumer action) { + public void ifArrayType(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayType() { + public Optional toArrayType() { return Optional.of(this); } @@ -324,7 +317,7 @@ public Optional toArrayType() { * In "{@code int[] a[];}", the element type is int. */ @Override - public Type getElementType() { + public Type getElementType() { return this.getComponentType().getElementType(); } @@ -332,12 +325,12 @@ public Type getElementType() { * returns the array level that is 0 for non array type. */ @Override - public int getArrayLevel() { + public int getArrayLevel() { return 1 + this.getComponentType().getArrayLevel(); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { return new ResolvedArrayType(getComponentType().convertToUsage(context)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java index 859a437029..41c3a5c2be 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java @@ -45,13 +45,11 @@ import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.resolution.types.ResolvedTypeVariable; - import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; @@ -69,10 +67,7 @@ * * @author Julio Vilmar Gesser */ -public class ClassOrInterfaceType extends ReferenceType - implements NodeWithSimpleName, - NodeWithAnnotations, - NodeWithTypeArguments { +public class ClassOrInterfaceType extends ReferenceType implements NodeWithSimpleName, NodeWithAnnotations, NodeWithTypeArguments { @OptionalProperty private ClassOrInterfaceType scope; @@ -82,32 +77,27 @@ public class ClassOrInterfaceType extends ReferenceType @OptionalProperty private NodeList typeArguments; - public ClassOrInterfaceType() { + public ClassOrInterfaceType() { this(null, null, new SimpleName(), null, new NodeList<>()); } /** * @deprecated use JavaParser.parseClassOrInterfaceType instead. This constructor does not understand generics. */ - public ClassOrInterfaceType(final String name) { + public ClassOrInterfaceType(final String name) { this(null, null, new SimpleName(name), null, new NodeList<>()); } - public ClassOrInterfaceType(final ClassOrInterfaceType scope, final String name) { + public ClassOrInterfaceType(final ClassOrInterfaceType scope, final String name) { this(null, scope, new SimpleName(name), null, new NodeList<>()); } - public ClassOrInterfaceType( - final ClassOrInterfaceType scope, final SimpleName name, final NodeList typeArguments) { + public ClassOrInterfaceType(final ClassOrInterfaceType scope, final SimpleName name, final NodeList typeArguments) { this(null, scope, name, typeArguments, new NodeList<>()); } @AllFieldsConstructor - public ClassOrInterfaceType( - final ClassOrInterfaceType scope, - final SimpleName name, - final NodeList typeArguments, - final NodeList annotations) { + public ClassOrInterfaceType(final ClassOrInterfaceType scope, final SimpleName name, final NodeList typeArguments, final NodeList annotations) { this(null, scope, name, typeArguments, annotations); } @@ -115,12 +105,7 @@ public ClassOrInterfaceType( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ClassOrInterfaceType( - TokenRange tokenRange, - ClassOrInterfaceType scope, - SimpleName name, - NodeList typeArguments, - NodeList annotations) { + public ClassOrInterfaceType(TokenRange tokenRange, ClassOrInterfaceType scope, SimpleName name, NodeList typeArguments, NodeList annotations) { super(tokenRange, annotations); setScope(scope); setName(name); @@ -130,22 +115,22 @@ public ClassOrInterfaceType( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } - public String getNameWithScope() { + public String getNameWithScope() { StringBuilder str = new StringBuilder(); getScope().ifPresent(s -> str.append(s.getNameWithScope()).append(".")); str.append(name.asString()); @@ -153,15 +138,15 @@ public String getNameWithScope() { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getScope() { + public Optional getScope() { return Optional.ofNullable(scope); } - public boolean isBoxedType() { + public boolean isBoxedType() { return PrimitiveType.unboxMap.containsKey(name.getIdentifier()); } - public PrimitiveType toUnboxedType() throws UnsupportedOperationException { + public PrimitiveType toUnboxedType() throws UnsupportedOperationException { if (!isBoxedType()) { throw new UnsupportedOperationException(name + " isn't a boxed type."); } @@ -169,13 +154,14 @@ public PrimitiveType toUnboxedType() throws UnsupportedOperationException { } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceType setName(final SimpleName name) { + public ClassOrInterfaceType setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; @@ -188,19 +174,20 @@ public ClassOrInterfaceType setName(final SimpleName name) { * @return this, the ClassOrInterfaceType */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceType setScope(final ClassOrInterfaceType scope) { + public ClassOrInterfaceType setScope(final ClassOrInterfaceType scope) { if (scope == this.scope) { return this; } notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope); - if (this.scope != null) this.scope.setParentNode(null); + if (this.scope != null) + this.scope.setParentNode(null); this.scope = scope; setAsParentNodeOf(scope); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional> getTypeArguments() { + public Optional> getTypeArguments() { return Optional.ofNullable(typeArguments); } @@ -211,25 +198,26 @@ public Optional> getTypeArguments() { * @return this, the ClassOrInterfaceType */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public ClassOrInterfaceType setTypeArguments(final NodeList typeArguments) { + public ClassOrInterfaceType setTypeArguments(final NodeList typeArguments) { if (typeArguments == this.typeArguments) { return this; } notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments); - if (this.typeArguments != null) this.typeArguments.setParentNode(null); + if (this.typeArguments != null) + this.typeArguments.setParentNode(null); this.typeArguments = typeArguments; setAsParentNodeOf(typeArguments); return this; } @Override - public ClassOrInterfaceType setAnnotations(NodeList annotations) { + public ClassOrInterfaceType setAnnotations(NodeList annotations) { return (ClassOrInterfaceType) super.setAnnotations(annotations); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -251,12 +239,11 @@ public boolean remove(Node node) { } @Override - public String asString() { + public String asString() { StringBuilder str = new StringBuilder(); getScope().ifPresent(s -> str.append(s.asString()).append(".")); str.append(name.asString()); - getTypeArguments() - .ifPresent(ta -> str.append(ta.stream().map(Type::asString).collect(joining(",", "<", ">")))); + getTypeArguments().ifPresent(ta -> str.append(ta.stream().map(Type::asString).collect(joining(",", "<", ">")))); return str.toString(); } @@ -265,31 +252,30 @@ public String asString() { * for example java/lang/Object */ @Override - public String toDescriptor() { - return String.format( - "L%s;", resolve().erasure().asReferenceType().getQualifiedName().replace(".", "/")); + public String toDescriptor() { + return String.format("L%s;", resolve().erasure().asReferenceType().getQualifiedName().replace(".", "/")); } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public ClassOrInterfaceType removeScope() { + public ClassOrInterfaceType removeScope() { return setScope((ClassOrInterfaceType) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ClassOrInterfaceType clone() { + public ClassOrInterfaceType clone() { return (ClassOrInterfaceType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ClassOrInterfaceTypeMetaModel getMetaModel() { + public ClassOrInterfaceTypeMetaModel getMetaModel() { return JavaParserMetaModel.classOrInterfaceTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -316,30 +302,30 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassOrInterfaceType() { + public boolean isClassOrInterfaceType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassOrInterfaceType asClassOrInterfaceType() { + public ClassOrInterfaceType asClassOrInterfaceType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassOrInterfaceType(Consumer action) { + public void ifClassOrInterfaceType(Consumer action) { action.accept(this); } @Override - public ResolvedType resolve() { + public ResolvedType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassOrInterfaceType() { + public Optional toClassOrInterfaceType() { return Optional.of(this); } @@ -351,7 +337,7 @@ public Optional toClassOrInterfaceType() { * @return The type resolved. */ @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { String name = getNameWithScope(); SymbolReference ref = context.solveType(name); if (!ref.isSolved()) { @@ -360,9 +346,7 @@ public ResolvedType convertToUsage(Context context) { ResolvedTypeDeclaration typeDeclaration = ref.getCorrespondingDeclaration(); List typeParameters = Collections.emptyList(); if (getTypeArguments().isPresent()) { - typeParameters = getTypeArguments().get().stream() - .map((pt) -> pt.convertToUsage(context)) - .collect(Collectors.toList()); + typeParameters = getTypeArguments().get().stream().map((pt) -> pt.convertToUsage(context)).collect(Collectors.toList()); } if (typeDeclaration.isTypeParameter()) { return new ResolvedTypeVariable(typeDeclaration.asTypeParameter()); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ConvertibleToUsage.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ConvertibleToUsage.java index c2ae8e173f..e32a01896c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ConvertibleToUsage.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ConvertibleToUsage.java @@ -25,7 +25,7 @@ /** * Convert a {@link Type} into a {@link ResolvedType}. */ -public interface ConvertibleToUsage { +public interface ConvertibleToUsage { ResolvedType convertToUsage(Context context); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java index 737a554a85..1232f07592 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java @@ -37,10 +37,8 @@ import com.github.javaparser.resolution.Context; import com.github.javaparser.resolution.types.ResolvedIntersectionType; import com.github.javaparser.resolution.types.ResolvedType; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; @@ -56,13 +54,13 @@ * * @since 3.0.0 */ -public class IntersectionType extends Type implements NodeWithAnnotations { +public class IntersectionType extends Type implements NodeWithAnnotations { @NonEmptyProperty private NodeList elements; @AllFieldsConstructor - public IntersectionType(NodeList elements) { + public IntersectionType(NodeList elements) { this(null, elements); } @@ -70,7 +68,7 @@ public IntersectionType(NodeList elements) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public IntersectionType(TokenRange tokenRange, NodeList elements) { + public IntersectionType(TokenRange tokenRange, NodeList elements) { super(tokenRange); setElements(elements); customInitialization(); @@ -78,42 +76,43 @@ public IntersectionType(TokenRange tokenRange, NodeList elements) @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getElements() { + public NodeList getElements() { return elements; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public IntersectionType setElements(final NodeList elements) { + public IntersectionType setElements(final NodeList elements) { assertNotNull(elements); if (elements == this.elements) { return this; } notifyPropertyChange(ObservableProperty.ELEMENTS, this.elements, elements); - if (this.elements != null) this.elements.setParentNode(null); + if (this.elements != null) + this.elements.setParentNode(null); this.elements = elements; setAsParentNodeOf(elements); return this; } @Override - public IntersectionType setAnnotations(NodeList annotations) { + public IntersectionType setAnnotations(NodeList annotations) { return (IntersectionType) super.setAnnotations(annotations); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -127,25 +126,25 @@ public boolean remove(Node node) { } @Override - public String asString() { + public String asString() { return elements.stream().map(Type::asString).collect(joining("&")); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public IntersectionType clone() { + public IntersectionType clone() { return (IntersectionType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public IntersectionTypeMetaModel getMetaModel() { + public IntersectionTypeMetaModel getMetaModel() { return JavaParserMetaModel.intersectionTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -160,35 +159,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIntersectionType() { + public boolean isIntersectionType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IntersectionType asIntersectionType() { + public IntersectionType asIntersectionType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIntersectionType(Consumer action) { + public void ifIntersectionType(Consumer action) { action.accept(this); } @Override - public ResolvedIntersectionType resolve() { + public ResolvedIntersectionType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedIntersectionType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIntersectionType() { + public Optional toIntersectionType() { return Optional.of(this); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { throw new UnsupportedOperationException(getClass().getCanonicalName()); } } 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 a7eb38d475..996277ef02 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 @@ -35,13 +35,12 @@ import com.github.javaparser.resolution.Context; import com.github.javaparser.resolution.types.ResolvedPrimitiveType; import com.github.javaparser.resolution.types.ResolvedType; - import java.util.HashMap; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; import static com.github.javaparser.utils.Utils.assertNotNull; +import com.github.javaparser.ast.Node; /** * A primitive type. @@ -51,7 +50,7 @@ * * @author Julio Vilmar Gesser */ -public class PrimitiveType extends Type implements NodeWithAnnotations { +public class PrimitiveType extends Type implements NodeWithAnnotations { public static PrimitiveType booleanType() { return new PrimitiveType(Primitive.BOOLEAN); @@ -85,7 +84,8 @@ public static PrimitiveType doubleType() { return new PrimitiveType(Primitive.DOUBLE); } - public enum Primitive { + public enum Primitive { + BOOLEAN("Boolean", "Z"), CHAR("Character", "C"), BYTE("Byte", "B"), @@ -122,15 +122,15 @@ public static Optional byBoxedTypeName(String simpleName) { return Optional.ofNullable(unboxMap.getOrDefault(simpleName, null)); } - public ClassOrInterfaceType toBoxedType() { + public ClassOrInterfaceType toBoxedType() { return parseClassOrInterfaceType(nameOfBoxedType); } - public String asString() { + public String asString() { return codeRepresentation; } - public String toDescriptor() { + public String toDescriptor() { return descriptor; } @@ -151,16 +151,16 @@ public String toDescriptor() { private Primitive type; - public PrimitiveType() { + public PrimitiveType() { this(null, Primitive.INT, new NodeList<>()); } - public PrimitiveType(final Primitive type) { + public PrimitiveType(final Primitive type) { this(null, type, new NodeList<>()); } @AllFieldsConstructor - public PrimitiveType(final Primitive type, NodeList annotations) { + public PrimitiveType(final Primitive type, NodeList annotations) { this(null, type, annotations); } @@ -168,7 +168,7 @@ public PrimitiveType(final Primitive type, NodeList annotations) * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public PrimitiveType(TokenRange tokenRange, Primitive type, NodeList annotations) { + public PrimitiveType(TokenRange tokenRange, Primitive type, NodeList annotations) { super(tokenRange, annotations); setType(type); customInitialization(); @@ -176,32 +176,32 @@ public PrimitiveType(TokenRange tokenRange, Primitive type, NodeList R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Primitive getType() { + public Primitive getType() { return type; } - public ClassOrInterfaceType toBoxedType() { + public ClassOrInterfaceType toBoxedType() { return type.toBoxedType(); } @Override - public String toDescriptor() { + public String toDescriptor() { return type.toDescriptor(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public PrimitiveType setType(final Primitive type) { + public PrimitiveType setType(final Primitive type) { assertNotNull(type); if (type == this.type) { return this; @@ -212,58 +212,58 @@ public PrimitiveType setType(final Primitive type) { } @Override - public String asString() { + public String asString() { return type.asString(); } @Override - public PrimitiveType setAnnotations(NodeList annotations) { + public PrimitiveType setAnnotations(NodeList annotations) { return (PrimitiveType) super.setAnnotations(annotations); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public PrimitiveType clone() { + public PrimitiveType clone() { return (PrimitiveType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public PrimitiveTypeMetaModel getMetaModel() { + public PrimitiveTypeMetaModel getMetaModel() { return JavaParserMetaModel.primitiveTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isPrimitiveType() { + public boolean isPrimitiveType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public PrimitiveType asPrimitiveType() { + public PrimitiveType asPrimitiveType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifPrimitiveType(Consumer action) { + public void ifPrimitiveType(Consumer action) { action.accept(this); } @Override - public ResolvedPrimitiveType resolve() { + public ResolvedPrimitiveType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedPrimitiveType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toPrimitiveType() { + public Optional toPrimitiveType() { return Optional.of(this); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { return ResolvedPrimitiveType.byName(getType().name()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java index b3626937a1..ac113e64da 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java @@ -39,12 +39,12 @@ */ public abstract class ReferenceType extends Type { - public ReferenceType() { + public ReferenceType() { this(null, new NodeList<>()); } @AllFieldsConstructor - public ReferenceType(NodeList annotations) { + public ReferenceType(NodeList annotations) { this(null, annotations); } @@ -52,44 +52,44 @@ public ReferenceType(NodeList annotations) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public ReferenceType(TokenRange tokenRange, NodeList annotations) { + public ReferenceType(TokenRange tokenRange, NodeList annotations) { super(tokenRange, annotations); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public ReferenceType clone() { + public ReferenceType clone() { return (ReferenceType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public ReferenceTypeMetaModel getMetaModel() { + public ReferenceTypeMetaModel getMetaModel() { return JavaParserMetaModel.referenceTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isReferenceType() { + public boolean isReferenceType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ReferenceType asReferenceType() { + public ReferenceType asReferenceType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifReferenceType(Consumer action) { + public void ifReferenceType(Consumer action) { action.accept(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toReferenceType() { + public Optional toReferenceType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java index b2f227ce3a..26b0533ac6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java @@ -32,10 +32,8 @@ import com.github.javaparser.metamodel.TypeMetaModel; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.types.ResolvedType; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.assertNotNull; @@ -57,7 +55,7 @@ protected Type(TokenRange range) { } @AllFieldsConstructor - public Type(NodeList annotations) { + public Type(NodeList annotations) { this(null, annotations); } @@ -65,29 +63,30 @@ public Type(NodeList annotations) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public Type(TokenRange tokenRange, NodeList annotations) { + public Type(TokenRange tokenRange, NodeList annotations) { super(tokenRange); setAnnotations(annotations); customInitialization(); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getAnnotations() { + public NodeList getAnnotations() { return annotations; } - public AnnotationExpr getAnnotation(int i) { + public AnnotationExpr getAnnotation(int i) { return getAnnotations().get(i); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Type setAnnotations(final NodeList annotations) { + public Type setAnnotations(final NodeList annotations) { assertNotNull(annotations); if (annotations == this.annotations) { return this; } notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); - if (this.annotations != null) this.annotations.setParentNode(null); + if (this.annotations != null) + this.annotations.setParentNode(null); this.annotations = annotations; setAsParentNodeOf(annotations); return this; @@ -98,24 +97,24 @@ public Type setAnnotations(final NodeList annotations) { *

* In "{@code int[] a[];}", the element type is int. */ - public Type getElementType() { + public Type getElementType() { return this; } /* * returns the array level that is 0 for non array type. */ - public int getArrayLevel() { + public int getArrayLevel() { return 0; } - public String toDescriptor() { + public String toDescriptor() { return ""; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -132,19 +131,19 @@ public boolean remove(Node node) { @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public Type clone() { + public Type clone() { return (Type) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TypeMetaModel getMetaModel() { + public TypeMetaModel getMetaModel() { return JavaParserMetaModel.typeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -158,215 +157,214 @@ public boolean replace(Node node, Node replacementNode) { } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isArrayType() { + public boolean isArrayType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ArrayType asArrayType() { - throw new IllegalStateException( - f("%s is not ArrayType, it is %s", this, this.getClass().getSimpleName())); + public ArrayType asArrayType() { + throw new IllegalStateException(f("%s is not ArrayType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isClassOrInterfaceType() { + public boolean isClassOrInterfaceType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ClassOrInterfaceType asClassOrInterfaceType() { - throw new IllegalStateException(f( - "%s is not ClassOrInterfaceType, it is %s", - this, this.getClass().getSimpleName())); + public ClassOrInterfaceType asClassOrInterfaceType() { + throw new IllegalStateException(f("%s is not ClassOrInterfaceType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isIntersectionType() { + public boolean isIntersectionType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public IntersectionType asIntersectionType() { - throw new IllegalStateException( - f("%s is not IntersectionType, it is %s", this, this.getClass().getSimpleName())); + public IntersectionType asIntersectionType() { + throw new IllegalStateException(f("%s is not IntersectionType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isPrimitiveType() { + public boolean isPrimitiveType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public PrimitiveType asPrimitiveType() { - throw new IllegalStateException( - f("%s is not PrimitiveType, it is %s", this, this.getClass().getSimpleName())); + public PrimitiveType asPrimitiveType() { + throw new IllegalStateException(f("%s is not PrimitiveType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isReferenceType() { + public boolean isReferenceType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public ReferenceType asReferenceType() { - throw new IllegalStateException( - f("%s is not ReferenceType, it is %s", this, this.getClass().getSimpleName())); + public ReferenceType asReferenceType() { + throw new IllegalStateException(f("%s is not ReferenceType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeParameter() { + public boolean isTypeParameter() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeParameter asTypeParameter() { - throw new IllegalStateException( - f("%s is not TypeParameter, it is %s", this, this.getClass().getSimpleName())); + public TypeParameter asTypeParameter() { + throw new IllegalStateException(f("%s is not TypeParameter, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnionType() { + public boolean isUnionType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnionType asUnionType() { - throw new IllegalStateException( - f("%s is not UnionType, it is %s", this, this.getClass().getSimpleName())); + public UnionType asUnionType() { + throw new IllegalStateException(f("%s is not UnionType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnknownType() { + public boolean isUnknownType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnknownType asUnknownType() { - throw new IllegalStateException( - f("%s is not UnknownType, it is %s", this, this.getClass().getSimpleName())); + public UnknownType asUnknownType() { + throw new IllegalStateException(f("%s is not UnknownType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVoidType() { + public boolean isVoidType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VoidType asVoidType() { - throw new IllegalStateException( - f("%s is not VoidType, it is %s", this, this.getClass().getSimpleName())); + public VoidType asVoidType() { + throw new IllegalStateException(f("%s is not VoidType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isWildcardType() { + public boolean isWildcardType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public WildcardType asWildcardType() { - throw new IllegalStateException( - f("%s is not WildcardType, it is %s", this, this.getClass().getSimpleName())); + public WildcardType asWildcardType() { + throw new IllegalStateException(f("%s is not WildcardType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifArrayType(Consumer action) {} + public void ifArrayType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifClassOrInterfaceType(Consumer action) {} + public void ifClassOrInterfaceType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifIntersectionType(Consumer action) {} + public void ifIntersectionType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifPrimitiveType(Consumer action) {} + public void ifPrimitiveType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifReferenceType(Consumer action) {} + public void ifReferenceType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeParameter(Consumer action) {} + public void ifTypeParameter(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnionType(Consumer action) {} + public void ifUnionType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnknownType(Consumer action) {} + public void ifUnknownType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVoidType(Consumer action) {} + public void ifVoidType(Consumer action) { + } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifWildcardType(Consumer action) {} + public void ifWildcardType(Consumer action) { + } @Override public abstract ResolvedType resolve(); @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toArrayType() { + public Optional toArrayType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toClassOrInterfaceType() { + public Optional toClassOrInterfaceType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toIntersectionType() { + public Optional toIntersectionType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toPrimitiveType() { + public Optional toPrimitiveType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toReferenceType() { + public Optional toReferenceType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeParameter() { + public Optional toTypeParameter() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnionType() { + public Optional toUnionType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnknownType() { + public Optional toUnknownType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVoidType() { + public Optional toVoidType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toWildcardType() { + public Optional toWildcardType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVarType() { + public boolean isVarType() { return false; } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VarType asVarType() { - throw new IllegalStateException( - f("%s is not VarType, it is %s", this, this.getClass().getSimpleName())); + public VarType asVarType() { + throw new IllegalStateException(f("%s is not VarType, it is %s", this, this.getClass().getSimpleName())); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVarType() { + public Optional toVarType() { return Optional.empty(); } @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVarType(Consumer action) {} + public void ifVarType(Consumer action) { + } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java index 5bb7d12e38..f35461fc4c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java @@ -38,10 +38,8 @@ import com.github.javaparser.resolution.Context; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.resolution.types.ResolvedTypeVariable; - import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; @@ -57,28 +55,26 @@ * @author Julio Vilmar Gesser * @see com.github.javaparser.ast.nodeTypes.NodeWithTypeParameters */ -public class TypeParameter extends ReferenceType - implements NodeWithSimpleName, NodeWithAnnotations { +public class TypeParameter extends ReferenceType implements NodeWithSimpleName, NodeWithAnnotations { private SimpleName name; private NodeList typeBound; - public TypeParameter() { + public TypeParameter() { this(null, new SimpleName(), new NodeList<>(), new NodeList<>()); } - public TypeParameter(final String name) { + public TypeParameter(final String name) { this(null, new SimpleName(name), new NodeList<>(), new NodeList<>()); } - public TypeParameter(final String name, final NodeList typeBound) { + public TypeParameter(final String name, final NodeList typeBound) { this(null, new SimpleName(name), typeBound, new NodeList<>()); } @AllFieldsConstructor - public TypeParameter( - SimpleName name, NodeList typeBound, NodeList annotations) { + public TypeParameter(SimpleName name, NodeList typeBound, NodeList annotations) { this(null, name, typeBound, annotations); } @@ -86,11 +82,7 @@ public TypeParameter( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public TypeParameter( - TokenRange tokenRange, - SimpleName name, - NodeList typeBound, - NodeList annotations) { + public TypeParameter(TokenRange tokenRange, SimpleName name, NodeList typeBound, NodeList annotations) { super(tokenRange, annotations); setName(name); setTypeBound(typeBound); @@ -99,13 +91,13 @@ public TypeParameter( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @@ -115,7 +107,7 @@ public void accept(final VoidVisitor v, final A arg) { * @return the name of the paramenter */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public SimpleName getName() { + public SimpleName getName() { return name; } @@ -126,45 +118,47 @@ public SimpleName getName() { * @return list of types that this paramente extends or {@code null} */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getTypeBound() { + public NodeList getTypeBound() { return typeBound; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TypeParameter setName(final SimpleName name) { + public TypeParameter setName(final SimpleName name) { assertNotNull(name); if (name == this.name) { return this; } notifyPropertyChange(ObservableProperty.NAME, this.name, name); - if (this.name != null) this.name.setParentNode(null); + if (this.name != null) + this.name.setParentNode(null); this.name = name; setAsParentNodeOf(name); return this; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public TypeParameter setTypeBound(final NodeList typeBound) { + public TypeParameter setTypeBound(final NodeList typeBound) { assertNotNull(typeBound); if (typeBound == this.typeBound) { return this; } notifyPropertyChange(ObservableProperty.TYPE_BOUND, this.typeBound, typeBound); - if (this.typeBound != null) this.typeBound.setParentNode(null); + if (this.typeBound != null) + this.typeBound.setParentNode(null); this.typeBound = typeBound; setAsParentNodeOf(typeBound); return this; } @Override - public TypeParameter setAnnotations(NodeList annotations) { + public TypeParameter setAnnotations(NodeList annotations) { super.setAnnotations(annotations); return this; } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -178,34 +172,32 @@ public boolean remove(Node node) { } @Override - public String asString() { + public String asString() { StringBuilder str = new StringBuilder(getNameAsString()); - getTypeBound() - .ifNonEmpty(l -> str.append( - l.stream().map(ClassOrInterfaceType::asString).collect(joining("&", " extends ", "")))); + getTypeBound().ifNonEmpty(l -> str.append(l.stream().map(ClassOrInterfaceType::asString).collect(joining("&", " extends ", "")))); return str.toString(); } @Override - public String toDescriptor() { + public String toDescriptor() { return String.format("L%s;", resolve().qualifiedName()); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public TypeParameter clone() { + public TypeParameter clone() { return (TypeParameter) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public TypeParameterMetaModel getMetaModel() { + public TypeParameterMetaModel getMetaModel() { return JavaParserMetaModel.typeParameterMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -224,35 +216,35 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isTypeParameter() { + public boolean isTypeParameter() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public TypeParameter asTypeParameter() { + public TypeParameter asTypeParameter() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifTypeParameter(Consumer action) { + public void ifTypeParameter(Consumer action) { action.accept(this); } @Override - public ResolvedTypeVariable resolve() { + public ResolvedTypeVariable resolve() { return getSymbolResolver().toResolvedType(this, ResolvedTypeVariable.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toTypeParameter() { + public Optional toTypeParameter() { return Optional.of(this); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { throw new UnsupportedOperationException(getClass().getCanonicalName()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java index 110a232e4a..a72e3ce41d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java @@ -37,12 +37,10 @@ import com.github.javaparser.resolution.Context; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.resolution.types.ResolvedUnionType; - import java.util.List; import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; @@ -63,12 +61,12 @@ *

* The types that make up the union type are its "elements" */ -public class UnionType extends Type implements NodeWithAnnotations { +public class UnionType extends Type implements NodeWithAnnotations { @NonEmptyProperty private NodeList elements; - public UnionType() { + public UnionType() { this(null, new NodeList<>()); } @@ -76,55 +74,56 @@ public UnionType() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public UnionType(TokenRange tokenRange, NodeList elements) { + public UnionType(TokenRange tokenRange, NodeList elements) { super(tokenRange); setElements(elements); customInitialization(); } @AllFieldsConstructor - public UnionType(NodeList elements) { + public UnionType(NodeList elements) { this(null, elements); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public NodeList getElements() { + public NodeList getElements() { return elements; } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public UnionType setElements(final NodeList elements) { + public UnionType setElements(final NodeList elements) { assertNotNull(elements); if (elements == this.elements) { return this; } notifyPropertyChange(ObservableProperty.ELEMENTS, this.elements, elements); - if (this.elements != null) this.elements.setParentNode(null); + if (this.elements != null) + this.elements.setParentNode(null); this.elements = elements; setAsParentNodeOf(elements); return this; } @Override - public UnionType setAnnotations(NodeList annotations) { + public UnionType setAnnotations(NodeList annotations) { return (UnionType) super.setAnnotations(annotations); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -138,25 +137,25 @@ public boolean remove(Node node) { } @Override - public String asString() { + public String asString() { return elements.stream().map(Type::asString).collect(joining("|")); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public UnionType clone() { + public UnionType clone() { return (UnionType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public UnionTypeMetaModel getMetaModel() { + public UnionTypeMetaModel getMetaModel() { return JavaParserMetaModel.unionTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -171,37 +170,36 @@ public boolean replace(Node node, Node replacementNode) { @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnionType() { + public boolean isUnionType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnionType asUnionType() { + public UnionType asUnionType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnionType(Consumer action) { + public void ifUnionType(Consumer action) { action.accept(this); } @Override - public ResolvedUnionType resolve() { + public ResolvedUnionType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedUnionType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnionType() { + public Optional toUnionType() { return Optional.of(this); } @Override - public ResolvedType convertToUsage(Context context) { - List resolvedElements = - getElements().stream().map(el -> el.convertToUsage(context)).collect(Collectors.toList()); + public ResolvedType convertToUsage(Context context) { + List resolvedElements = getElements().stream().map(el -> el.convertToUsage(context)).collect(Collectors.toList()); return new ResolvedUnionType(resolvedElements); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java index 6206be0b88..9e68c250e3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java @@ -46,10 +46,10 @@ * * @author Didier Villevalois */ -public class UnknownType extends Type { +public class UnknownType extends Type { @AllFieldsConstructor - public UnknownType() { + public UnknownType() { this(null); } @@ -57,25 +57,25 @@ public UnknownType() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public UnknownType(TokenRange tokenRange) { + public UnknownType(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public UnknownType setAnnotations(NodeList annotations) { + public UnknownType setAnnotations(NodeList annotations) { if (annotations.size() > 0) { throw new IllegalStateException("Inferred lambda types cannot be annotated."); } @@ -83,48 +83,48 @@ public UnknownType setAnnotations(NodeList annotations) { } @Override - public String asString() { + public String asString() { return ""; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public UnknownType clone() { + public UnknownType clone() { return (UnknownType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public UnknownTypeMetaModel getMetaModel() { + public UnknownTypeMetaModel getMetaModel() { return JavaParserMetaModel.unknownTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isUnknownType() { + public boolean isUnknownType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public UnknownType asUnknownType() { + public UnknownType asUnknownType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifUnknownType(Consumer action) { + public void ifUnknownType(Consumer action) { action.accept(this); } @Override - public ResolvedType resolve() { + public ResolvedType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedReferenceType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toUnknownType() { + public Optional toUnknownType() { return Optional.of(this); } @@ -132,7 +132,7 @@ public Optional toUnknownType() { * A "phantom" node, is a node that is not really an AST node (like the fake type of variable in FieldDeclaration) */ @Override - public boolean isPhantom() { + public boolean isPhantom() { return true; } @@ -144,7 +144,7 @@ public boolean isPhantom() { * @return The type resolved. */ @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { throw new IllegalArgumentException("Inferred lambda parameter type"); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java index df29c302c3..f7b8d79784 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java @@ -40,7 +40,6 @@ import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl; import com.github.javaparser.resolution.types.ResolvedArrayType; import com.github.javaparser.resolution.types.ResolvedType; - import java.util.List; import java.util.Optional; import java.util.function.Consumer; @@ -53,12 +52,12 @@ *

  • var a = new ArrayList<String>();
    • * */ -public class VarType extends Type { +public class VarType extends Type { private static final String JAVA_LANG_OBJECT = Object.class.getCanonicalName(); @AllFieldsConstructor - public VarType() { + public VarType() { this(null); } @@ -66,76 +65,76 @@ public VarType() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public VarType(TokenRange tokenRange) { + public VarType(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override - public VarType setAnnotations(NodeList annotations) { + public VarType setAnnotations(NodeList annotations) { return (VarType) super.setAnnotations(annotations); } @Override - public String asString() { + public String asString() { return "var"; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public VarType clone() { + public VarType clone() { return (VarType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public VarTypeMetaModel getMetaModel() { + public VarTypeMetaModel getMetaModel() { return JavaParserMetaModel.varTypeMetaModel; } @Override - public ResolvedType resolve() { + public ResolvedType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedType.class); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVarType() { + public boolean isVarType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VarType asVarType() { + public VarType asVarType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVarType() { + public Optional toVarType() { return Optional.of(this); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVarType(Consumer action) { + public void ifVarType(Consumer action) { action.accept(this); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { Node parent = getParentNode().get(); if (!(parent instanceof VariableDeclarator)) { throw new IllegalStateException("Trying to resolve a `var` which is not in a variable declaration."); @@ -157,14 +156,10 @@ public ResolvedType convertToUsage(Context context) { if (iterType.isReferenceType()) { // The type of a variable in a for-each loop with an // Iterable with parameter type - List parametersType = - iterType.asReferenceType().typeParametersMap().getTypes(); + List parametersType = iterType.asReferenceType().typeParametersMap().getTypes(); if (parametersType.isEmpty()) { - Optional oObjectDeclaration = - context.solveType(JAVA_LANG_OBJECT).getDeclaration(); - return oObjectDeclaration - .map(decl -> ReferenceTypeImpl.undeterminedParameters(decl.asReferenceType())) - .orElseThrow(() -> new UnsupportedOperationException()); + Optional oObjectDeclaration = context.solveType(JAVA_LANG_OBJECT).getDeclaration(); + return oObjectDeclaration.map(decl -> ReferenceTypeImpl.undeterminedParameters(decl.asReferenceType())).orElseThrow(() -> new UnsupportedOperationException()); } return parametersType.get(0); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java index f2697225c1..8e6f6c751a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java @@ -45,10 +45,10 @@ * * @author Julio Vilmar Gesser */ -public class VoidType extends Type implements NodeWithAnnotations { +public class VoidType extends Type implements NodeWithAnnotations { @AllFieldsConstructor - public VoidType() { + public VoidType() { this(null); } @@ -56,81 +56,81 @@ public VoidType() { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public VoidType(TokenRange tokenRange) { + public VoidType(TokenRange tokenRange) { super(tokenRange); customInitialization(); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Override - public VoidType setAnnotations(NodeList annotations) { + public VoidType setAnnotations(NodeList annotations) { return (VoidType) super.setAnnotations(annotations); } @Override - public String asString() { + public String asString() { return "void"; } @Override - public String toDescriptor() { + public String toDescriptor() { return "V"; } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public VoidType clone() { + public VoidType clone() { return (VoidType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public VoidTypeMetaModel getMetaModel() { + public VoidTypeMetaModel getMetaModel() { return JavaParserMetaModel.voidTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isVoidType() { + public boolean isVoidType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public VoidType asVoidType() { + public VoidType asVoidType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifVoidType(Consumer action) { + public void ifVoidType(Consumer action) { action.accept(this); } @Override - public ResolvedVoidType resolve() { + public ResolvedVoidType resolve() { return getSymbolResolver().toResolvedType(this, ResolvedVoidType.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toVoidType() { + public Optional toVoidType() { return Optional.of(this); } @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { return ResolvedVoidType.INSTANCE; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java index 0cc73d61d9..692d216a4c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java @@ -48,7 +48,7 @@ * * @author Julio Vilmar Gesser */ -public class WildcardType extends Type implements NodeWithAnnotations { +public class WildcardType extends Type implements NodeWithAnnotations { @OptionalProperty private ReferenceType extendedType; @@ -56,19 +56,16 @@ public class WildcardType extends Type implements NodeWithAnnotations()); } - public WildcardType(final ReferenceType extendedType) { + public WildcardType(final ReferenceType extendedType) { this(null, extendedType, null, new NodeList<>()); } @AllFieldsConstructor - public WildcardType( - final ReferenceType extendedType, - final ReferenceType superType, - final NodeList annotations) { + public WildcardType(final ReferenceType extendedType, final ReferenceType superType, final NodeList annotations) { this(null, extendedType, superType, annotations); } @@ -76,11 +73,7 @@ public WildcardType( * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public WildcardType( - TokenRange tokenRange, - ReferenceType extendedType, - ReferenceType superType, - NodeList annotations) { + public WildcardType(TokenRange tokenRange, ReferenceType extendedType, ReferenceType superType, NodeList annotations) { super(tokenRange, annotations); setExtendedType(extendedType); setSuperType(superType); @@ -89,23 +82,23 @@ public WildcardType( @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public R accept(final GenericVisitor v, final A arg) { + public R accept(final GenericVisitor v, final A arg) { return v.visit(this, arg); } @Override @Generated("com.github.javaparser.generator.core.node.AcceptGenerator") - public void accept(final VoidVisitor v, final A arg) { + public void accept(final VoidVisitor v, final A arg) { v.visit(this, arg); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getExtendedType() { + public Optional getExtendedType() { return Optional.ofNullable(extendedType); } @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public Optional getSuperType() { + public Optional getSuperType() { return Optional.ofNullable(superType); } @@ -116,12 +109,13 @@ public Optional getSuperType() { * @return this, the WildcardType */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public WildcardType setExtendedType(final ReferenceType extendedType) { + public WildcardType setExtendedType(final ReferenceType extendedType) { if (extendedType == this.extendedType) { return this; } notifyPropertyChange(ObservableProperty.EXTENDED_TYPE, this.extendedType, extendedType); - if (this.extendedType != null) this.extendedType.setParentNode(null); + if (this.extendedType != null) + this.extendedType.setParentNode(null); this.extendedType = extendedType; setAsParentNodeOf(extendedType); return this; @@ -134,25 +128,26 @@ public WildcardType setExtendedType(final ReferenceType extendedType) { * @return this, the WildcardType */ @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public WildcardType setSuperType(final ReferenceType superType) { + public WildcardType setSuperType(final ReferenceType superType) { if (superType == this.superType) { return this; } notifyPropertyChange(ObservableProperty.SUPER_TYPE, this.superType, superType); - if (this.superType != null) this.superType.setParentNode(null); + if (this.superType != null) + this.superType.setParentNode(null); this.superType = superType; setAsParentNodeOf(superType); return this; } @Override - public WildcardType setAnnotations(NodeList annotations) { + public WildcardType setAnnotations(NodeList annotations) { return (WildcardType) super.setAnnotations(annotations); } @Override @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public boolean remove(Node node) { + public boolean remove(Node node) { if (node == null) { return false; } @@ -172,7 +167,7 @@ public boolean remove(Node node) { } @Override - public String asString() { + public String asString() { StringBuilder str = new StringBuilder("?"); getExtendedType().ifPresent(t -> str.append(" extends ").append(t.asString())); getSuperType().ifPresent(t -> str.append(" super ").append(t.asString())); @@ -180,30 +175,30 @@ public String asString() { } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public WildcardType removeExtendedType() { + public WildcardType removeExtendedType() { return setExtendedType((ReferenceType) null); } @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") - public WildcardType removeSuperType() { + public WildcardType removeSuperType() { return setSuperType((ReferenceType) null); } @Override @Generated("com.github.javaparser.generator.core.node.CloneGenerator") - public WildcardType clone() { + public WildcardType clone() { return (WildcardType) accept(new CloneVisitor(), null); } @Override @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator") - public WildcardTypeMetaModel getMetaModel() { + public WildcardTypeMetaModel getMetaModel() { return JavaParserMetaModel.wildcardTypeMetaModel; } @Override @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator") - public boolean replace(Node node, Node replacementNode) { + public boolean replace(Node node, Node replacementNode) { if (node == null) { return false; } @@ -226,7 +221,7 @@ public boolean replace(Node node, Node replacementNode) { * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - public WildcardType(TokenRange tokenRange, ReferenceType extendedType, ReferenceType superType) { + public WildcardType(TokenRange tokenRange, ReferenceType extendedType, ReferenceType superType) { super(tokenRange); setExtendedType(extendedType); setSuperType(superType); @@ -235,30 +230,30 @@ public WildcardType(TokenRange tokenRange, ReferenceType extendedType, Reference @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public boolean isWildcardType() { + public boolean isWildcardType() { return true; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public WildcardType asWildcardType() { + public WildcardType asWildcardType() { return this; } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public void ifWildcardType(Consumer action) { + public void ifWildcardType(Consumer action) { action.accept(this); } @Override - public ResolvedWildcard resolve() { + public ResolvedWildcard resolve() { return getSymbolResolver().toResolvedType(this, ResolvedWildcard.class); } @Override @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") - public Optional toWildcardType() { + public Optional toWildcardType() { return Optional.of(this); } @@ -270,7 +265,7 @@ public Optional toWildcardType() { * @return The type resolved. */ @Override - public ResolvedType convertToUsage(Context context) { + public ResolvedType convertToUsage(Context context) { if (getExtendedType().isPresent() && !getSuperType().isPresent()) { // removed (ReferenceTypeImpl) return ResolvedWildcard.extendsBound(getExtendedType().get().convertToUsage(context)); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java index 5d8927dc80..f579b9aeff 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.validator; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import com.github.javaparser.Problem; import com.github.javaparser.TokenRange; import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange; @@ -31,11 +30,11 @@ /** * A simple interface where validators can report found problems. */ -public class ProblemReporter { +public class ProblemReporter { private final Consumer problemConsumer; - public ProblemReporter(Consumer problemConsumer) { + public ProblemReporter(Consumer problemConsumer) { this.problemConsumer = problemConsumer; } @@ -45,7 +44,7 @@ public ProblemReporter(Consumer problemConsumer) { * @param message description of the problem * @param node the node in which the problem occurred, used to find the Range of the problem. */ - public void report(final NodeWithTokenRange node, final UpgradeJavaMessage message, final Object... args) { + public void report(final NodeWithTokenRange node, final UpgradeJavaMessage message, final Object... args) { this.report(node.getTokenRange().orElse(null), message.toString(), args); } @@ -55,11 +54,11 @@ public void report(final NodeWithTokenRange node, final UpgradeJavaMessage me * @param message description of the problem * @param node the node in which the problem occurred, used to find the Range of the problem. */ - public void report(NodeWithTokenRange node, String message, Object... args) { + public void report(NodeWithTokenRange node, String message, Object... args) { this.report(node.getTokenRange().orElse(null), message, args); } - public void report(TokenRange range, String message, Object... args) { + public void report(TokenRange range, String message, Object... args) { problemConsumer.accept(new Problem(f(message, args), range, null)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java index 4fe7bd7736..f246e32c3e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java @@ -29,16 +29,16 @@ * Validates that "record" cannot be used as identifier for type declarations (e.g., classes, enums, and records). * For details, see JEP 395 */ -public class RecordAsTypeIdentifierNotAllowed extends VisitorValidator { +public class RecordAsTypeIdentifierNotAllowed extends VisitorValidator { private final String error; - public RecordAsTypeIdentifierNotAllowed() { + public RecordAsTypeIdentifierNotAllowed() { error = "'record' is a restricted identifier and cannot be used for type declarations"; } @Override - public void visit(Name n, ProblemReporter arg) { + public void visit(Name n, ProblemReporter arg) { if ("record".equals(n.getIdentifier()) && !validUsage(n)) { arg.report(n, error); } @@ -46,7 +46,7 @@ public void visit(Name n, ProblemReporter arg) { } @Override - public void visit(SimpleName n, ProblemReporter arg) { + public void visit(SimpleName n, ProblemReporter arg) { if ("record".equals(n.getIdentifier()) && !validUsage(n)) { arg.report(n, error); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java index e61b82bc0d..6782431582 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.validator; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import com.github.javaparser.ast.expr.Name; import com.github.javaparser.ast.expr.SimpleName; @@ -29,19 +28,19 @@ * Validates that identifiers are not keywords - this for the few keywords that the parser * accepts because they were added after Java 1.0. */ -public class ReservedKeywordValidator extends VisitorValidator { +public class ReservedKeywordValidator extends VisitorValidator { private final String keyword; private final String error; - public ReservedKeywordValidator(String keyword) { + public ReservedKeywordValidator(String keyword) { this.keyword = keyword; error = f("'%s' cannot be used as an identifier as it is a keyword.", keyword); } @Override - public void visit(Name n, ProblemReporter arg) { + public void visit(Name n, ProblemReporter arg) { if (n.getIdentifier().equals(keyword)) { arg.report(n, error); } @@ -49,7 +48,7 @@ public void visit(Name n, ProblemReporter arg) { } @Override - public void visit(SimpleName n, ProblemReporter arg) { + public void visit(SimpleName n, ProblemReporter arg) { if (n.getIdentifier().equals(keyword)) { arg.report(n, error); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SimpleValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SimpleValidator.java index e1e1cdc050..844f1ad47b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SimpleValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SimpleValidator.java @@ -28,9 +28,9 @@ * Runs a validator on all nodes of a certain type, * and adds a problem for all nodes that pass a condition. */ -public class SimpleValidator extends SingleNodeTypeValidator { +public class SimpleValidator extends SingleNodeTypeValidator { - public SimpleValidator(Class type, Predicate condition, BiConsumer problemSupplier) { + public SimpleValidator(Class type, Predicate condition, BiConsumer problemSupplier) { super(type, (node, problemReporter) -> { if (condition.test(node)) { problemSupplier.accept(node, problemReporter); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SingleNodeTypeValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SingleNodeTypeValidator.java index 0899405fc9..4eb5d5c3a3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SingleNodeTypeValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/SingleNodeTypeValidator.java @@ -25,19 +25,19 @@ /** * Runs a validator on all nodes of a certain type. */ -public class SingleNodeTypeValidator implements Validator { +public class SingleNodeTypeValidator implements Validator { private final Class type; private final TypedValidator validator; - public SingleNodeTypeValidator(Class type, TypedValidator validator) { + public SingleNodeTypeValidator(Class type, TypedValidator validator) { this.type = type; this.validator = validator; } @Override - public void accept(Node node, ProblemReporter problemReporter) { + public void accept(Node node, ProblemReporter problemReporter) { if (type.isInstance(node)) { validator.accept(type.cast(node), problemReporter); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TreeVisitorValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TreeVisitorValidator.java index de0ccb23e1..3b840243c5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TreeVisitorValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TreeVisitorValidator.java @@ -25,11 +25,11 @@ /** * A validator that walks the whole tree, visiting every node. */ -public class TreeVisitorValidator implements Validator { +public class TreeVisitorValidator implements Validator { private final Validator validator; - public TreeVisitorValidator(Validator validator) { + public TreeVisitorValidator(Validator validator) { this.validator = validator; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java index 6db3a9b41e..bf8fa3186e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java @@ -29,7 +29,7 @@ /** * A validator that validates a known node type. */ -public interface TypedValidator extends BiConsumer { +public interface TypedValidator extends BiConsumer { /** * @param node the node that wants to be validated @@ -42,10 +42,8 @@ default Processor processor() { return new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { - result.getResult() - .ifPresent(node -> accept((N) node, new ProblemReporter(problem -> result.getProblems() - .add(problem)))); + public void postProcess(ParseResult result, ParserConfiguration configuration) { + result.getResult().ifPresent(node -> accept((N) node, new ProblemReporter(problem -> result.getProblems().add(problem)))); } }; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validator.java index c89f0cc5a2..98059aac60 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validator.java @@ -26,7 +26,7 @@ * A validator that can be run on a node to check for semantic errors. * It is fully up to the implementor how to do this. */ -public interface Validator extends TypedValidator { +public interface Validator extends TypedValidator { /** * @param node the node that wants to be validated diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validators.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validators.java index eb549deff3..7dc9708e28 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validators.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Validators.java @@ -28,38 +28,38 @@ /** * A validator that will call a collection of validators. */ -public class Validators implements Validator { +public class Validators implements Validator { private final List validators = new ArrayList<>(); - public Validators(Validator... validators) { + public Validators(Validator... validators) { this.validators.addAll(Arrays.asList(validators)); } - public List getValidators() { + public List getValidators() { return validators; } - public Validators remove(Validator validator) { + public Validators remove(Validator validator) { if (!validators.remove(validator)) { throw new AssertionError("Trying to remove a validator that isn't there."); } return this; } - public Validators replace(Validator oldValidator, Validator newValidator) { + public Validators replace(Validator oldValidator, Validator newValidator) { remove(oldValidator); add(newValidator); return this; } - public Validators add(Validator newValidator) { + public Validators add(Validator newValidator) { validators.add(newValidator); return this; } @Override - public void accept(Node node, ProblemReporter problemReporter) { + public void accept(Node node, ProblemReporter problemReporter) { validators.forEach(v -> v.accept(node, problemReporter)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/VisitorValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/VisitorValidator.java index 8fda18730b..bff0c9eb7f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/VisitorValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/VisitorValidator.java @@ -31,7 +31,7 @@ public abstract class VisitorValidator extends VoidVisitorAdapter implements Validator { @Override - public void accept(Node node, ProblemReporter problemReporter) { + public void accept(Node node, ProblemReporter problemReporter) { node.accept(this, problemReporter); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10PreviewValidator.java index 994f52afa9..1588077a2c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/10/ */ -public class Java10PreviewValidator extends Java10Validator { +public class Java10PreviewValidator extends Java10Validator { - public Java10PreviewValidator() { + public Java10PreviewValidator() { super(); // Incubator // No incubator language features added within Java 10 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java index 1ada1da74f..e53fdd96aa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java @@ -30,12 +30,11 @@ * * @see https://openjdk.java.net/projects/jdk/10/ */ -public class Java10Validator extends Java9Validator { +public class Java10Validator extends Java9Validator { - final Validator varOnlyOnLocalVariableDefinitionAndForAndTry = - new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false)); + final Validator varOnlyOnLocalVariableDefinitionAndForAndTry = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false)); - public Java10Validator() { + public Java10Validator() { super(); // Released Language Features { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11PreviewValidator.java index f90db8f23e..dad7a88f29 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/11/ */ -public class Java11PreviewValidator extends Java11Validator { +public class Java11PreviewValidator extends Java11Validator { - public Java11PreviewValidator() { + public Java11PreviewValidator() { super(); // Incubator // No incubator language features added within Java 11 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11Validator.java index 6b3a28ff8c..c756c31d99 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java11Validator.java @@ -30,11 +30,11 @@ * * @see https://openjdk.java.net/projects/jdk/11/ */ -public class Java11Validator extends Java10Validator { +public class Java11Validator extends Java10Validator { final Validator varAlsoInLambdaParameters = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(true)); - public Java11Validator() { + public Java11Validator() { super(); { /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12PreviewValidator.java index 7aafcc21ad..88e0b8feac 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/12/ */ -public class Java12PreviewValidator extends Java12Validator { +public class Java12PreviewValidator extends Java12Validator { - public Java12PreviewValidator() { + public Java12PreviewValidator() { super(); // Incubator // No new incubator language features added within Java 12 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12Validator.java index 9977a1a29b..f3b93c901f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java12Validator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/12/ */ -public class Java12Validator extends Java11Validator { +public class Java12Validator extends Java11Validator { - public Java12Validator() { + public Java12Validator() { super(); // Released Language Features // No new released language features added within Java 12 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13PreviewValidator.java index 0ac210cc78..5a53d410ce 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/13/ */ -public class Java13PreviewValidator extends Java13Validator { +public class Java13PreviewValidator extends Java13Validator { - public Java13PreviewValidator() { + public Java13PreviewValidator() { super(); // Incubator // No new incubator language features added within Java 13 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13Validator.java index a8794963b4..b76807e68e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java13Validator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/13/ */ -public class Java13Validator extends Java12Validator { +public class Java13Validator extends Java12Validator { - public Java13Validator() { + public Java13Validator() { super(); // Released Language Features // No new released language features added in Java 13 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14PreviewValidator.java index 3d0fe7bf08..d407d6e311 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/14/ */ -public class Java14PreviewValidator extends Java14Validator { +public class Java14PreviewValidator extends Java14Validator { - public Java14PreviewValidator() { + public Java14PreviewValidator() { super(); // Incubator // No new incubator language features added within Java 14 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java index b0aff6092f..ba5c276c22 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java @@ -31,7 +31,7 @@ * * @see https://openjdk.java.net/projects/jdk/14/ */ -public class Java14Validator extends Java13Validator { +public class Java14Validator extends Java13Validator { /** * With the introduction of record classes, {@code record} is no longer permitted as an identifier. @@ -46,10 +46,9 @@ public class Java14Validator extends Java13Validator { */ final Validator recordAsTypeIdentifierNotAllowed = new RecordAsTypeIdentifierNotAllowed(); - final Validator recordDeclarationValidator = - new SingleNodeTypeValidator<>(RecordDeclaration.class, new RecordDeclarationValidator()); + final Validator recordDeclarationValidator = new SingleNodeTypeValidator<>(RecordDeclaration.class, new RecordDeclarationValidator()); - public Java14Validator() { + public Java14Validator() { super(); // Released Language Features { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15PreviewValidator.java index 802ab379c3..7e854b8500 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/15/ */ -public class Java15PreviewValidator extends Java15Validator { +public class Java15PreviewValidator extends Java15Validator { - public Java15PreviewValidator() { + public Java15PreviewValidator() { super(); // Incubator // No new incubator language features added within Java 15 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15Validator.java index b2b608b5f3..17f8b05ac1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java15Validator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/15/ */ -public class Java15Validator extends Java14Validator { +public class Java15Validator extends Java14Validator { - public Java15Validator() { + public Java15Validator() { super(); // Released Language Features // Text Block Literals - released within Java 15 - https://openjdk.java.net/jeps/378 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16PreviewValidator.java index e660e4440c..07575e20fd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/16/ */ -public class Java16PreviewValidator extends Java16Validator { +public class Java16PreviewValidator extends Java16Validator { - public Java16PreviewValidator() { + public Java16PreviewValidator() { super(); // Incubator // No new incubator language features added in Java 16 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16Validator.java index 4a7d854a37..fa5f3b9ef0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java16Validator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/16/ */ -public class Java16Validator extends Java15Validator { +public class Java16Validator extends Java15Validator { - public Java16Validator() { + public Java16Validator() { super(); // Released Language Features // Pattern Matching for instanceof released within Java 16 - https://openjdk.java.net/jeps/305 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17PreviewValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17PreviewValidator.java index 898271ab6d..d61d3519c2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17PreviewValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17PreviewValidator.java @@ -25,9 +25,9 @@ * * @see https://openjdk.java.net/projects/jdk/17/ */ -public class Java17PreviewValidator extends Java17Validator { +public class Java17PreviewValidator extends Java17Validator { - public Java17PreviewValidator() { + public Java17PreviewValidator() { super(); // Incubator // No new incubator language features added in Java 17 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java index 1923e74224..63aaad7df8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java @@ -30,27 +30,13 @@ * * @see https://openjdk.java.net/projects/jdk/17/ */ -public class Java17Validator extends Java16Validator { +public class Java17Validator extends Java16Validator { - final Validator sealedNotAllowedAsIdentifier = new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> n.getName().getIdentifier().equals("sealed"), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "'sealed' identifier is not authorised in this context.", - ParserConfiguration.LanguageLevel.JAVA_17))); + final Validator sealedNotAllowedAsIdentifier = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getName().getIdentifier().equals("sealed"), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'sealed' identifier is not authorised in this context.", ParserConfiguration.LanguageLevel.JAVA_17))); - final Validator permitsNotAllowedAsIdentifier = new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> n.getName().getIdentifier().equals("permits"), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "'permits' identifier is not authorised in this context.", - ParserConfiguration.LanguageLevel.JAVA_17))); + final Validator permitsNotAllowedAsIdentifier = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getName().getIdentifier().equals("permits"), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'permits' identifier is not authorised in this context.", ParserConfiguration.LanguageLevel.JAVA_17))); - public Java17Validator() { + public Java17Validator() { super(); // Released Language Features // Sealed Classes - https://openjdk.java.net/jeps/409 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java18Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java18Validator.java index cbde069938..d86c059512 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java18Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java18Validator.java @@ -24,9 +24,9 @@ * * @see https://openjdk.java.net/projects/jdk/18/ */ -public class Java18Validator extends Java17Validator { +public class Java18Validator extends Java17Validator { - public Java18Validator() { + public Java18Validator() { super(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java19Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java19Validator.java index bc3ba50db3..e23c9e1a00 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java19Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java19Validator.java @@ -24,9 +24,9 @@ * * @see https://openjdk.java.net/projects/jdk/19/ */ -public class Java19Validator extends Java18Validator { +public class Java19Validator extends Java18Validator { - public Java19Validator() { + public Java19Validator() { super(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java index 21588c57ed..8ad7d6add2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java @@ -40,229 +40,97 @@ /** * This validator validates according to Java 1.0 syntax rules. */ -public class Java1_0Validator extends Validators { +public class Java1_0Validator extends Validators { - final Validator modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = - new ModifierValidator(false, false, false); + final Validator modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = new ModifierValidator(false, false, false); - final Validator noAssertKeyword = new SimpleValidator<>( - AssertStmt.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "'assert' keyword is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_4))); + final Validator noAssertKeyword = new SimpleValidator<>(AssertStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'assert' keyword is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_4))); - final Validator noInnerClasses = new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> !n.isTopLevelType(), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "inner classes or interfaces are not supported.", - ParserConfiguration.LanguageLevel.JAVA_1_1))); + final Validator noInnerClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> !n.isTopLevelType(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("inner classes or interfaces are not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1))); - final Validator noReflection = new SimpleValidator<>( - ClassExpr.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Reflection is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1))); + final Validator noReflection = new SimpleValidator<>(ClassExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Reflection is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1))); final Validator noGenerics = new TreeVisitorValidator((node, reporter) -> { if (node instanceof NodeWithTypeArguments) { - if (((NodeWithTypeArguments) node) - .getTypeArguments() - .isPresent()) { - reporter.report( - node, - new UpgradeJavaMessage( - "Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); + if (((NodeWithTypeArguments) node).getTypeArguments().isPresent()) { + reporter.report(node, new UpgradeJavaMessage("Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); } } if (node instanceof NodeWithTypeParameters) { - if (((NodeWithTypeParameters) node) - .getTypeParameters() - .isNonEmpty()) { - reporter.report( - node, - new UpgradeJavaMessage( - "Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); + if (((NodeWithTypeParameters) node).getTypeParameters().isNonEmpty()) { + reporter.report(node, new UpgradeJavaMessage("Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); } } }); - final SingleNodeTypeValidator tryWithoutResources = - new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { - if (n.getCatchClauses().isEmpty() && !n.getFinallyBlock().isPresent()) { - reporter.report( - n, - new UpgradeJavaMessage( - "Try has no finally and no catch.", ParserConfiguration.LanguageLevel.JAVA_7)); - } - if (n.getResources().isNonEmpty()) { - reporter.report( - n, - new UpgradeJavaMessage( - "Catch with resource is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)); - } - }); + final SingleNodeTypeValidator tryWithoutResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { + if (n.getCatchClauses().isEmpty() && !n.getFinallyBlock().isPresent()) { + reporter.report(n, new UpgradeJavaMessage("Try has no finally and no catch.", ParserConfiguration.LanguageLevel.JAVA_7)); + } + if (n.getResources().isNonEmpty()) { + reporter.report(n, new UpgradeJavaMessage("Catch with resource is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)); + } + }); final Validator noAnnotations = new TreeVisitorValidator((node, reporter) -> { if (node instanceof AnnotationExpr || node instanceof AnnotationDeclaration) { - reporter.report( - node, - new UpgradeJavaMessage("Annotations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); + reporter.report(node, new UpgradeJavaMessage("Annotations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)); } }); - final Validator noEnums = new SimpleValidator<>( - EnumDeclaration.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Enumerations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); + final Validator noEnums = new SimpleValidator<>(EnumDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Enumerations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); - final Validator noVarargs = new SimpleValidator<>( - Parameter.class, - Parameter::isVarArgs, - (n, reporter) -> reporter.report( - n, new UpgradeJavaMessage("Varargs are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); + final Validator noVarargs = new SimpleValidator<>(Parameter.class, Parameter::isVarArgs, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Varargs are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); - final Validator noForEach = new SimpleValidator<>( - ForEachStmt.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "For-each loops are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); + final Validator noForEach = new SimpleValidator<>(ForEachStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("For-each loops are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); - final Validator noStaticImports = new SimpleValidator<>( - ImportDeclaration.class, - ImportDeclaration::isStatic, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Static imports are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); + final Validator noStaticImports = new SimpleValidator<>(ImportDeclaration.class, ImportDeclaration::isStatic, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Static imports are not supported.", ParserConfiguration.LanguageLevel.JAVA_5))); - final Validator onlyOneLabelInSwitchCase = new SimpleValidator<>( - SwitchEntry.class, - n -> n.getLabels().size() > 1, - (n, reporter) -> reporter.report( - n.getLabels().getParentNode().get(), - new UpgradeJavaMessage( - "Only one label allowed in a switch-case.", ParserConfiguration.LanguageLevel.JAVA_7))); + final Validator onlyOneLabelInSwitchCase = new SimpleValidator<>(SwitchEntry.class, n -> n.getLabels().size() > 1, (n, reporter) -> reporter.report(n.getLabels().getParentNode().get(), new UpgradeJavaMessage("Only one label allowed in a switch-case.", ParserConfiguration.LanguageLevel.JAVA_7))); - final Validator noYield = new SimpleValidator<>( - YieldStmt.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Only labels allowed in break statements.", ParserConfiguration.LanguageLevel.JAVA_13))); + final Validator noYield = new SimpleValidator<>(YieldStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Only labels allowed in break statements.", ParserConfiguration.LanguageLevel.JAVA_13))); final Validator noBinaryIntegerLiterals = new NoBinaryIntegerLiteralsValidator(); final Validator noUnderscoresInIntegerLiterals = new NoUnderscoresInIntegerLiteralsValidator(); - final Validator noMultiCatch = new SimpleValidator<>( - UnionType.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage("Multi-catch is not supported.", ParserConfiguration.LanguageLevel.JAVA_7))); + final Validator noMultiCatch = new SimpleValidator<>(UnionType.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Multi-catch is not supported.", ParserConfiguration.LanguageLevel.JAVA_7))); - final Validator noLambdas = new SimpleValidator<>( - LambdaExpr.class, - n -> true, - (n, reporter) -> reporter.report( - n, new UpgradeJavaMessage("Lambdas are not supported.", ParserConfiguration.LanguageLevel.JAVA_8))); + final Validator noLambdas = new SimpleValidator<>(LambdaExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Lambdas are not supported.", ParserConfiguration.LanguageLevel.JAVA_8))); - final Validator noModules = new SimpleValidator<>( - ModuleDeclaration.class, - n -> true, - (n, reporter) -> reporter.report( - n, new UpgradeJavaMessage("Modules are not supported.", ParserConfiguration.LanguageLevel.JAVA_9))); + final Validator noModules = new SimpleValidator<>(ModuleDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Modules are not supported.", ParserConfiguration.LanguageLevel.JAVA_9))); - final Validator noSwitchExpressions = new SimpleValidator<>( - SwitchExpr.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Switch expressions are not supported.", ParserConfiguration.LanguageLevel.JAVA_12))); + final Validator noSwitchExpressions = new SimpleValidator<>(SwitchExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Switch expressions are not supported.", ParserConfiguration.LanguageLevel.JAVA_12))); - final Validator noPatternMatchingInstanceOf = new SimpleValidator<>( - InstanceOfExpr.class, - n -> n.getPattern().isPresent(), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Use of patterns with instanceof is not supported.", - ParserConfiguration.LanguageLevel.JAVA_14))); + final Validator noPatternMatchingInstanceOf = new SimpleValidator<>(InstanceOfExpr.class, n -> n.getPattern().isPresent(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Use of patterns with instanceof is not supported.", ParserConfiguration.LanguageLevel.JAVA_14))); - final Validator noTextBlockLiteral = new SimpleValidator<>( - TextBlockLiteralExpr.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Text Block Literals are not supported.", ParserConfiguration.LanguageLevel.JAVA_15))); + final Validator noTextBlockLiteral = new SimpleValidator<>(TextBlockLiteralExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Text Block Literals are not supported.", ParserConfiguration.LanguageLevel.JAVA_15))); - final Validator noRecordDeclaration = new SimpleValidator<>( - RecordDeclaration.class, - n -> true, - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Record Declarations are not supported.", ParserConfiguration.LanguageLevel.JAVA_14))); + final Validator noRecordDeclaration = new SimpleValidator<>(RecordDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Record Declarations are not supported.", ParserConfiguration.LanguageLevel.JAVA_14))); - final Validator noSealedClasses = new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> n.hasModifier(Modifier.Keyword.SEALED) || n.hasModifier(Modifier.Keyword.NON_SEALED), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Sealed classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_15))); + final Validator noSealedClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.hasModifier(Modifier.DefaultKeyword.SEALED) || n.hasModifier(Modifier.DefaultKeyword.NON_SEALED), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Sealed classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_15))); - final Validator noPermitsListInClasses = new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> n.getPermittedTypes().isNonEmpty(), - (n, reporter) -> reporter.report( - n, - new UpgradeJavaMessage( - "Permitted sub-classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_17))); + final Validator noPermitsListInClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getPermittedTypes().isNonEmpty(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Permitted sub-classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_17))); final Validator noSwitchNullDefault = new SingleNodeTypeValidator<>(SwitchEntry.class, (n, reporter) -> { if (n.getLabels().isNonEmpty() && n.isDefault()) { - reporter.report( - n, - new UpgradeJavaMessage( - "Switch case null, default not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); + reporter.report(n, new UpgradeJavaMessage("Switch case null, default not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); } }); final Validator noSwitchPatterns = new SingleNodeTypeValidator<>(SwitchEntry.class, (n, reporter) -> { if (n.getGuard().isPresent() || n.getLabels().stream().anyMatch(expr -> expr.isPatternExpr())) { - reporter.report( - n, - new UpgradeJavaMessage( - "Switch patterns not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); + reporter.report(n, new UpgradeJavaMessage("Switch patterns not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); } }); final Validator noRecordPatterns = new TreeVisitorValidator((node, reporter) -> { if (node instanceof RecordPatternExpr) { - reporter.report( - node, - new UpgradeJavaMessage( - "Record patterns are not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); + reporter.report(node, new UpgradeJavaMessage("Record patterns are not supported.", ParserConfiguration.LanguageLevel.JAVA_21)); } }); - public Java1_0Validator() { + public Java1_0Validator() { super(new CommonValidators()); add(modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods); add(noAssertKeyword); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java index bedf520e7c..aa172aafc0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java @@ -29,20 +29,14 @@ /** * This validator validates according to Java 1.1 syntax rules. */ -public class Java1_1Validator extends Java1_0Validator { +public class Java1_1Validator extends Java1_0Validator { - final Validator innerClasses = - new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> n.getParentNode() - .ifPresent(p -> { - if (p instanceof LocalClassDeclarationStmt && n.isInterface()) - reporter.report( - n, - new UpgradeJavaMessage( - "There is no such thing as a local interface.", - ParserConfiguration.LanguageLevel.JAVA_16)); - })); + final Validator innerClasses = new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> n.getParentNode().ifPresent(p -> { + if (p instanceof LocalClassDeclarationStmt && n.isInterface()) + reporter.report(n, new UpgradeJavaMessage("There is no such thing as a local interface.", ParserConfiguration.LanguageLevel.JAVA_16)); + })); - public Java1_1Validator() { + public Java1_1Validator() { super(); replace(noInnerClasses, innerClasses); remove(noReflection); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java index efd7f90d54..33d443717f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java @@ -27,18 +27,15 @@ /** * This validator validates according to Java 1.2 syntax rules. */ -public class Java1_2Validator extends Java1_1Validator { +public class Java1_2Validator extends Java1_1Validator { - final Validator modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = - new ModifierValidator(true, false, false); + final Validator modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = new ModifierValidator(true, false, false); final Validator strictfpNotAllowed = new ReservedKeywordValidator("strictfp"); - public Java1_2Validator() { + public Java1_2Validator() { super(); - replace( - modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, - modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods); + replace(modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods); add(strictfpNotAllowed); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_3Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_3Validator.java index 7cf146cc7a..a0d322f95e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_3Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_3Validator.java @@ -23,9 +23,9 @@ /** * This validator validates according to Java 1.3 syntax rules. */ -public class Java1_3Validator extends Java1_2Validator { +public class Java1_3Validator extends Java1_2Validator { - public Java1_3Validator() { + public Java1_3Validator() { super(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_4Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_4Validator.java index c95e33b4d4..1609d6cd4d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_4Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_4Validator.java @@ -23,9 +23,9 @@ /** * This validator validates according to Java 1.4 syntax rules. */ -public class Java1_4Validator extends Java1_3Validator { +public class Java1_4Validator extends Java1_3Validator { - public Java1_4Validator() { + public Java1_4Validator() { super(); remove(noAssertKeyword); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java20Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java20Validator.java index a963cda08a..4c5204101c 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java20Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java20Validator.java @@ -24,9 +24,9 @@ * * @see https://openjdk.java.net/projects/jdk/20/ */ -public class Java20Validator extends Java19Validator { +public class Java20Validator extends Java19Validator { - public Java20Validator() { + public Java20Validator() { super(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java21Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java21Validator.java index a894414bac..b6e91df9e8 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java21Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java21Validator.java @@ -24,9 +24,9 @@ * * @see https://openjdk.java.net/projects/jdk/21/ */ -public class Java21Validator extends Java20Validator { +public class Java21Validator extends Java20Validator { - public Java21Validator() { + public Java21Validator() { super(); remove(noSwitchNullDefault); remove(noSwitchPatterns); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java index 186aa9b96a..b7acdd3f3d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java @@ -37,16 +37,13 @@ /** * This validator validates according to Java 5 syntax rules. */ -public class Java5Validator extends Java1_4Validator { +public class Java5Validator extends Java1_4Validator { final Validator genericsWithoutDiamondOperator = new TreeVisitorValidator((node, reporter) -> { if (node instanceof NodeWithTypeArguments) { Optional> typeArguments = ((NodeWithTypeArguments) node).getTypeArguments(); if (typeArguments.isPresent() && typeArguments.get().isEmpty()) { - reporter.report( - node, - new UpgradeJavaMessage( - "The diamond operator is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)); + reporter.report(node, new UpgradeJavaMessage("The diamond operator is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)); } } }); @@ -68,16 +65,13 @@ public class Java5Validator extends Java1_4Validator { VariableDeclarationExpr declaration = node.getVariable(); // assert that the variable declaration expression has exactly one variable declarator if (declaration.getVariables().size() != 1) { - reporter.report( - node, - "A foreach statement's variable declaration must have exactly one variable " + "declarator. Given: " - + declaration.getVariables().size() + "."); + reporter.report(node, "A foreach statement's variable declaration must have exactly one variable " + "declarator. Given: " + declaration.getVariables().size() + "."); } }); final Validator enumNotAllowed = new ReservedKeywordValidator("enum"); - public Java5Validator() { + public Java5Validator() { super(); replace(noGenerics, genericsWithoutDiamondOperator); add(noPrimitiveGenericArguments); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java6Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java6Validator.java index 9061338c58..16a3733f79 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java6Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java6Validator.java @@ -23,9 +23,9 @@ /** * This validator validates according to Java 6 syntax rules. */ -public class Java6Validator extends Java5Validator { +public class Java6Validator extends Java5Validator { - public Java6Validator() { + public Java6Validator() { super(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java index ce4ba37909..7353629195 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java @@ -28,31 +28,27 @@ /** * This validator validates according to Java 7 syntax rules. */ -public class Java7Validator extends Java6Validator { +public class Java7Validator extends Java6Validator { - final SingleNodeTypeValidator tryWithLimitedResources = - new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { - if (n.getCatchClauses().isEmpty() - && n.getResources().isEmpty() - && !n.getFinallyBlock().isPresent()) { - reporter.report(n, "Try has no finally, no catch, and no resources."); - } - for (Expression resource : n.getResources()) { - if (!resource.isVariableDeclarationExpr()) { - reporter.report(n, "Try with resources only supports variable declarations."); - } - } - }); + final SingleNodeTypeValidator tryWithLimitedResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { + if (n.getCatchClauses().isEmpty() && n.getResources().isEmpty() && !n.getFinallyBlock().isPresent()) { + reporter.report(n, "Try has no finally, no catch, and no resources."); + } + for (Expression resource : n.getResources()) { + if (!resource.isVariableDeclarationExpr()) { + reporter.report(n, "Try with resources only supports variable declarations."); + } + } + }); - private final SingleNodeTypeValidator multiCatch = - new SingleNodeTypeValidator<>(UnionType.class, (n, reporter) -> { - // Case "0 elements" is caught elsewhere. - if (n.getElements().size() == 1) { - reporter.report(n, "Union type (multi catch) must have at least two elements."); - } - }); + private final SingleNodeTypeValidator multiCatch = new SingleNodeTypeValidator<>(UnionType.class, (n, reporter) -> { + // Case "0 elements" is caught elsewhere. + if (n.getElements().size() == 1) { + reporter.report(n, "Union type (multi catch) must have at least two elements."); + } + }); - public Java7Validator() { + public Java7Validator() { super(); remove(genericsWithoutDiamondOperator); replace(tryWithoutResources, tryWithLimitedResources); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java index 2ee334bded..631de9fd78 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java @@ -31,26 +31,23 @@ * @see https://openjdk.java.net/projects/jdk8/ * @see https://openjdk.java.net/projects/jdk8/features */ -public class Java8Validator extends Java7Validator { +public class Java8Validator extends Java7Validator { final Validator modifiersWithoutPrivateInterfaceMethods = new ModifierValidator(true, true, false); - final Validator defaultMethodsInInterface = - new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> { - if (n.isInterface()) { - n.getMethods().forEach(m -> { - if (m.isDefault() && !m.getBody().isPresent()) { - reporter.report(m, "'default' methods must have a body."); - } - }); + final Validator defaultMethodsInInterface = new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> { + if (n.isInterface()) { + n.getMethods().forEach(m -> { + if (m.isDefault() && !m.getBody().isPresent()) { + reporter.report(m, "'default' methods must have a body."); } }); + } + }); - public Java8Validator() { + public Java8Validator() { super(); - replace( - modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, - modifiersWithoutPrivateInterfaceMethods); + replace(modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, modifiersWithoutPrivateInterfaceMethods); add(defaultMethodsInInterface); remove(noLambdas); // TODO validate more annotation locations http://openjdk.java.net/jeps/104 diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java index 4b4aadd88a..6c91606d52 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java @@ -31,22 +31,19 @@ * * @see https://openjdk.java.net/projects/jdk9/ */ -public class Java9Validator extends Java8Validator { +public class Java9Validator extends Java8Validator { final Validator underscoreKeywordValidator = new UnderscoreKeywordValidator(); final Validator modifiers = new ModifierValidator(true, true, true); - final SingleNodeTypeValidator tryWithResources = - new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { - if (n.getCatchClauses().isEmpty() - && n.getResources().isEmpty() - && !n.getFinallyBlock().isPresent()) { - reporter.report(n, "Try has no finally, no catch, and no resources."); - } - }); + final SingleNodeTypeValidator tryWithResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> { + if (n.getCatchClauses().isEmpty() && n.getResources().isEmpty() && !n.getFinallyBlock().isPresent()) { + reporter.report(n, "Try has no finally, no catch, and no resources."); + } + }); - public Java9Validator() { + public Java9Validator() { super(); // Released Language Features /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java index b6c21d63d0..2a4513479f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java @@ -52,9 +52,7 @@ public final class UpgradeJavaMessage { } @Override - public String toString() { - return String.format( - "%s Pay attention that this feature is supported starting from '%s' language level. If you need that feature the language level must be configured in the configuration before parsing the source files.", - this.reason, this.level.toString()); + public String toString() { + return String.format("%s Pay attention that this feature is supported starting from '%s' language level. If you need that feature the language level must be configured in the configuration before parsing the source files.", this.reason, this.level.toString()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java index a5d2ec776a..7dce940765 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java @@ -34,56 +34,40 @@ /** * Contains validations that are valid for every Java version. */ -public class CommonValidators extends Validators { +public class CommonValidators extends Validators { - public CommonValidators() { - super( - new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> !n.isInterface() && n.getExtendedTypes().size() > 1, - (n, reporter) -> reporter.report( - n.getExtendedTypes(1), "A class cannot extend more than one other class.")), - new SimpleValidator<>( - ClassOrInterfaceDeclaration.class, - n -> n.isInterface() && !n.getImplementedTypes().isEmpty(), - (n, reporter) -> reporter.report( - n.getImplementedTypes(0), "An interface cannot implement other interfaces.")), - new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> { - if (n.isInterface()) { - n.getMembers().forEach(mem -> { - if (mem instanceof InitializerDeclaration) { - reporter.report(mem, "An interface cannot have initializers."); - } - }); + public CommonValidators() { + super(new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> !n.isInterface() && n.getExtendedTypes().size() > 1, (n, reporter) -> reporter.report(n.getExtendedTypes(1), "A class cannot extend more than one other class.")), new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.isInterface() && !n.getImplementedTypes().isEmpty(), (n, reporter) -> reporter.report(n.getImplementedTypes(0), "An interface cannot implement other interfaces.")), new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> { + if (n.isInterface()) { + n.getMembers().forEach(mem -> { + if (mem instanceof InitializerDeclaration) { + reporter.report(mem, "An interface cannot have initializers."); } - }), - new SingleNodeTypeValidator<>(AssignExpr.class, (n, reporter) -> { - // https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.26 - Expression target = n.getTarget(); - while (target instanceof EnclosedExpr) { - target = ((EnclosedExpr) target).getInner(); - } - if (target instanceof NameExpr - || target instanceof ArrayAccessExpr - || target instanceof FieldAccessExpr) { - return; - } - reporter.report(n.getTarget(), "Illegal left hand side of an assignment."); - }), - new TreeVisitorValidator((node, problemReporter) -> { - NodeMetaModel mm = node.getMetaModel(); - for (PropertyMetaModel ppm : mm.getAllPropertyMetaModels()) { - if (ppm.isNonEmpty()) { - if (ppm.isNodeList()) { - NodeList value = (NodeList) ppm.getValue(node); - if (value.isEmpty()) { - problemReporter.report( - node, "%s.%s can not be empty.", mm.getTypeName(), ppm.getName()); - } - } - // No need to check empty strings, it should be impossible to set them to "" + }); + } + }), new SingleNodeTypeValidator<>(AssignExpr.class, (n, reporter) -> { + // https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.26 + Expression target = n.getTarget(); + while (target instanceof EnclosedExpr) { + target = ((EnclosedExpr) target).getInner(); + } + if (target instanceof NameExpr || target instanceof ArrayAccessExpr || target instanceof FieldAccessExpr) { + return; + } + reporter.report(n.getTarget(), "Illegal left hand side of an assignment."); + }), new TreeVisitorValidator((node, problemReporter) -> { + NodeMetaModel mm = node.getMetaModel(); + for (PropertyMetaModel ppm : mm.getAllPropertyMetaModels()) { + if (ppm.isNonEmpty()) { + if (ppm.isNodeList()) { + NodeList value = (NodeList) ppm.getValue(node); + if (value.isEmpty()) { + problemReporter.report(node, "%s.%s can not be empty.", mm.getTypeName(), ppm.getName()); } } - })); + // No need to check empty strings, it should be impossible to set them to "" + } + } + })); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java index 46057cfa73..1a22087ee9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java @@ -20,9 +20,8 @@ */ package com.github.javaparser.ast.validator.language_level_validations.chunks; -import static com.github.javaparser.ast.Modifier.Keyword.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; import static java.util.Arrays.asList; - import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.expr.LambdaExpr; @@ -40,18 +39,13 @@ /** * Verifies that only allowed modifiers are used where modifiers are expected. */ -public class ModifierValidator extends VisitorValidator { +public class ModifierValidator extends VisitorValidator { - private final Modifier.Keyword[] interfaceWithNothingSpecial = - new Modifier.Keyword[] {PUBLIC, PROTECTED, ABSTRACT, FINAL, SYNCHRONIZED, NATIVE, STRICTFP}; + private final Modifier.Keyword[] interfaceWithNothingSpecial = new Modifier.Keyword[] { PUBLIC, PROTECTED, ABSTRACT, FINAL, SYNCHRONIZED, NATIVE, STRICTFP }; - private final Modifier.Keyword[] interfaceWithStaticAndDefault = - new Modifier.Keyword[] {PUBLIC, PROTECTED, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT - }; + private final Modifier.Keyword[] interfaceWithStaticAndDefault = new Modifier.Keyword[] { PUBLIC, PROTECTED, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT }; - private final Modifier.Keyword[] interfaceWithStaticAndDefaultAndPrivate = new Modifier.Keyword[] { - PUBLIC, PROTECTED, PRIVATE, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT - }; + private final Modifier.Keyword[] interfaceWithStaticAndDefaultAndPrivate = new Modifier.Keyword[] { PUBLIC, PROTECTED, PRIVATE, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT }; private final boolean hasStrictfp; @@ -59,15 +53,14 @@ public class ModifierValidator extends VisitorValidator { private final boolean hasPrivateInterfaceMethods; - public ModifierValidator( - boolean hasStrictfp, boolean hasDefaultAndStaticInterfaceMethods, boolean hasPrivateInterfaceMethods) { + public ModifierValidator(boolean hasStrictfp, boolean hasDefaultAndStaticInterfaceMethods, boolean hasPrivateInterfaceMethods) { this.hasStrictfp = hasStrictfp; this.hasDefaultAndStaticInterfaceMethods = hasDefaultAndStaticInterfaceMethods; this.hasPrivateInterfaceMethods = hasPrivateInterfaceMethods; } @Override - public void visit(ClassOrInterfaceDeclaration n, ProblemReporter reporter) { + public void visit(ClassOrInterfaceDeclaration n, ProblemReporter reporter) { if (n.isInterface()) { validateInterfaceModifiers(n, reporter); } else { @@ -80,8 +73,7 @@ private void validateClassModifiers(ClassOrInterfaceDeclaration n, ProblemReport if (n.isTopLevelType()) { validateModifiers(n, reporter, PUBLIC, ABSTRACT, FINAL, STRICTFP, SEALED, NON_SEALED); } else if (n.isNestedType()) { - validateModifiers( - n, reporter, PUBLIC, PROTECTED, PRIVATE, ABSTRACT, STATIC, FINAL, STRICTFP, SEALED, NON_SEALED); + validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, ABSTRACT, STATIC, FINAL, STRICTFP, SEALED, NON_SEALED); } else if (n.isLocalClassDeclaration()) { validateModifiers(n, reporter, ABSTRACT, FINAL, STRICTFP, SEALED, NON_SEALED); } @@ -96,7 +88,7 @@ private void validateInterfaceModifiers(TypeDeclaration n, ProblemReporter re } @Override - public void visit(EnumDeclaration n, ProblemReporter reporter) { + public void visit(EnumDeclaration n, ProblemReporter reporter) { if (n.isTopLevelType()) { validateModifiers(n, reporter, PUBLIC, STRICTFP); } else if (n.isNestedType()) { @@ -106,35 +98,34 @@ public void visit(EnumDeclaration n, ProblemReporter reporter) { } @Override - public void visit(AnnotationDeclaration n, ProblemReporter reporter) { + public void visit(AnnotationDeclaration n, ProblemReporter reporter) { validateInterfaceModifiers(n, reporter); super.visit(n, reporter); } @Override - public void visit(AnnotationMemberDeclaration n, ProblemReporter reporter) { + public void visit(AnnotationMemberDeclaration n, ProblemReporter reporter) { validateModifiers(n, reporter, PUBLIC, ABSTRACT); super.visit(n, reporter); } @Override - public void visit(ConstructorDeclaration n, ProblemReporter reporter) { + public void visit(ConstructorDeclaration n, ProblemReporter reporter) { validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE); n.getParameters().forEach(p -> validateModifiers(p, reporter, FINAL)); super.visit(n, reporter); } @Override - public void visit(FieldDeclaration n, ProblemReporter reporter) { + public void visit(FieldDeclaration n, ProblemReporter reporter) { validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, STATIC, FINAL, TRANSIENT, VOLATILE); super.visit(n, reporter); } @Override - public void visit(MethodDeclaration n, ProblemReporter reporter) { + public void visit(MethodDeclaration n, ProblemReporter reporter) { if (n.isAbstract()) { - final SeparatedItemStringBuilder builder = - new SeparatedItemStringBuilder("Cannot be 'abstract' and also '", "', '", "'."); + final SeparatedItemStringBuilder builder = new SeparatedItemStringBuilder("Cannot be 'abstract' and also '", "', '", "'."); for (Modifier.Keyword m : asList(PRIVATE, STATIC, FINAL, NATIVE, STRICTFP, SYNCHRONIZED)) { if (n.hasModifier(m)) { builder.append(m.asString()); @@ -157,18 +148,7 @@ public void visit(MethodDeclaration n, ProblemReporter reporter) { validateModifiers(n, reporter, interfaceWithNothingSpecial); } } else { - validateModifiers( - n, - reporter, - PUBLIC, - PROTECTED, - PRIVATE, - ABSTRACT, - STATIC, - FINAL, - SYNCHRONIZED, - NATIVE, - STRICTFP); + validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP); } } } @@ -177,7 +157,7 @@ public void visit(MethodDeclaration n, ProblemReporter reporter) { } @Override - public void visit(LambdaExpr n, ProblemReporter reporter) { + public void visit(LambdaExpr n, ProblemReporter reporter) { n.getParameters().forEach(p -> { // Final is not allowed on inferred parameters, but those get caught by the parser. validateModifiers(p, reporter, FINAL); @@ -186,25 +166,24 @@ public void visit(LambdaExpr n, ProblemReporter reporter) { } @Override - public void visit(CatchClause n, ProblemReporter reporter) { + public void visit(CatchClause n, ProblemReporter reporter) { validateModifiers(n.getParameter(), reporter, FINAL); super.visit(n, reporter); } @Override - public void visit(VariableDeclarationExpr n, ProblemReporter reporter) { + public void visit(VariableDeclarationExpr n, ProblemReporter reporter) { validateModifiers(n, reporter, FINAL); super.visit(n, reporter); } @Override - public void visit(ModuleRequiresDirective n, ProblemReporter reporter) { + public void visit(ModuleRequiresDirective n, ProblemReporter reporter) { validateModifiers(n, reporter, TRANSITIVE, STATIC); super.visit(n, reporter); } - private & NodeWithTokenRange> void validateModifiers( - T n, ProblemReporter reporter, Modifier.Keyword... allowedModifiers) { + private & NodeWithTokenRange> void validateModifiers(T n, ProblemReporter reporter, Modifier.Keyword... allowedModifiers) { validateAtMostOneOf(n, reporter, PUBLIC, PROTECTED, PRIVATE); validateAtMostOneOf(n, reporter, FINAL, ABSTRACT); if (hasStrictfp) { @@ -235,8 +214,7 @@ private boolean arrayContains(Object[] items, Object searchItem) { return false; } - private & NodeWithTokenRange> void validateAtMostOneOf( - T t, ProblemReporter reporter, Modifier.Keyword... modifiers) { + private & NodeWithTokenRange> void validateAtMostOneOf(T t, ProblemReporter reporter, Modifier.DefaultKeyword... modifiers) { List foundModifiers = new ArrayList<>(); for (Modifier.Keyword m : modifiers) { if (t.hasModifier(m)) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoBinaryIntegerLiteralsValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoBinaryIntegerLiteralsValidator.java index f185385eb6..b83c62dd44 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoBinaryIntegerLiteralsValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoBinaryIntegerLiteralsValidator.java @@ -26,16 +26,16 @@ import com.github.javaparser.ast.validator.ProblemReporter; import com.github.javaparser.ast.validator.VisitorValidator; -public class NoBinaryIntegerLiteralsValidator extends VisitorValidator { +public class NoBinaryIntegerLiteralsValidator extends VisitorValidator { @Override - public void visit(IntegerLiteralExpr n, ProblemReporter arg) { + public void visit(IntegerLiteralExpr n, ProblemReporter arg) { validate(n, arg); super.visit(n, arg); } @Override - public void visit(LongLiteralExpr n, ProblemReporter arg) { + public void visit(LongLiteralExpr n, ProblemReporter arg) { validate(n, arg); super.visit(n, arg); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoUnderscoresInIntegerLiteralsValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoUnderscoresInIntegerLiteralsValidator.java index 9479391c69..7c8ecae4a1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoUnderscoresInIntegerLiteralsValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/NoUnderscoresInIntegerLiteralsValidator.java @@ -26,16 +26,16 @@ import com.github.javaparser.ast.validator.ProblemReporter; import com.github.javaparser.ast.validator.VisitorValidator; -public class NoUnderscoresInIntegerLiteralsValidator extends VisitorValidator { +public class NoUnderscoresInIntegerLiteralsValidator extends VisitorValidator { @Override - public void visit(IntegerLiteralExpr n, ProblemReporter arg) { + public void visit(IntegerLiteralExpr n, ProblemReporter arg) { validate(n, arg); super.visit(n, arg); } @Override - public void visit(LongLiteralExpr n, ProblemReporter arg) { + public void visit(LongLiteralExpr n, ProblemReporter arg) { validate(n, arg); super.visit(n, arg); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java index 57e26a78e1..f34c861632 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java @@ -24,10 +24,10 @@ import com.github.javaparser.ast.validator.ProblemReporter; import com.github.javaparser.ast.validator.TypedValidator; -public class RecordDeclarationValidator implements TypedValidator { +public class RecordDeclarationValidator implements TypedValidator { @Override - public void accept(RecordDeclaration node, ProblemReporter reporter) { + public void accept(RecordDeclaration node, ProblemReporter reporter) { forbidAbstractModifier(node, reporter); forbidNonStaticFieldsInRecords(node, reporter); validateRecordComponentAccessorMethods(node, reporter); @@ -40,9 +40,7 @@ private void forbidAbstractModifier(RecordDeclaration n, ProblemReporter reporte } private void forbidNonStaticFieldsInRecords(RecordDeclaration n, ProblemReporter reporter) { - long nonStaticFieldCount = n.getFields().stream() - .filter(fieldDeclaration -> !fieldDeclaration.isStatic()) - .count(); + long nonStaticFieldCount = n.getFields().stream().filter(fieldDeclaration -> !fieldDeclaration.isStatic()).count(); if (nonStaticFieldCount > 0) { reporter.report(n, "Record Declarations must have zero non-static fields."); } @@ -77,18 +75,11 @@ private void forbidNonStaticFieldsInRecords(RecordDeclaration n, ProblemReporter */ private void validateRecordComponentAccessorMethods(RecordDeclaration n, ProblemReporter reporter) { n.getParameters().forEach(parameter -> { - n.getMethodsByName(parameter.getNameAsString()).stream() - .filter(methodDeclaration -> - methodDeclaration.getParameters().isEmpty()) - .forEach(methodDeclaration -> { - if (!methodDeclaration.getType().equals(parameter.getType())) { - reporter.report( - n, - String.format( - "Incorrect component accessor return type. Expected: '%s', found: '%s'.", - parameter.getTypeAsString(), methodDeclaration.getTypeAsString())); - } - }); + n.getMethodsByName(parameter.getNameAsString()).stream().filter(methodDeclaration -> methodDeclaration.getParameters().isEmpty()).forEach(methodDeclaration -> { + if (!methodDeclaration.getType().equals(parameter.getType())) { + reporter.report(n, String.format("Incorrect component accessor return type. Expected: '%s', found: '%s'.", parameter.getTypeAsString(), methodDeclaration.getTypeAsString())); + } + }); }); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/UnderscoreKeywordValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/UnderscoreKeywordValidator.java index 6613ef83aa..54066b7c7f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/UnderscoreKeywordValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/UnderscoreKeywordValidator.java @@ -26,16 +26,16 @@ import com.github.javaparser.ast.validator.ProblemReporter; import com.github.javaparser.ast.validator.VisitorValidator; -public class UnderscoreKeywordValidator extends VisitorValidator { +public class UnderscoreKeywordValidator extends VisitorValidator { @Override - public void visit(Name n, ProblemReporter arg) { + public void visit(Name n, ProblemReporter arg) { validateIdentifier(n, n.getIdentifier(), arg); super.visit(n, arg); } @Override - public void visit(SimpleName n, ProblemReporter arg) { + public void visit(SimpleName n, ProblemReporter arg) { validateIdentifier(n, n.getIdentifier(), arg); super.visit(n, arg); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java index ee7b0569be..b3311e0406 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java @@ -36,26 +36,23 @@ import com.github.javaparser.ast.validator.TypedValidator; import java.util.Optional; -public class VarValidator implements TypedValidator { +public class VarValidator implements TypedValidator { private boolean varAllowedInLambdaParameters; - public VarValidator(boolean varAllowedInLambdaParameters) { + public VarValidator(boolean varAllowedInLambdaParameters) { this.varAllowedInLambdaParameters = varAllowedInLambdaParameters; } @Override - public void accept(VarType node, ProblemReporter reporter) { + public void accept(VarType node, ProblemReporter reporter) { // All allowed locations are within a VariableDeclaration inside a VariableDeclarationExpr inside something // else. Optional variableDeclarator = node.findAncestor(VariableDeclarator.class); if (!variableDeclarator.isPresent()) { // Java 11's var in lambda's if (varAllowedInLambdaParameters) { - boolean valid = node.findAncestor(Parameter.class) - .flatMap(Node::getParentNode) - .map((Node p) -> p instanceof LambdaExpr) - .orElse(false); + boolean valid = node.findAncestor(Parameter.class).flatMap(Node::getParentNode).map((Node p) -> p instanceof LambdaExpr).orElse(false); if (valid) { return; } @@ -87,10 +84,7 @@ public void accept(VarType node, ProblemReporter reporter) { return; } container.ifPresent(c -> { - boolean positionIsFine = c instanceof ForStmt - || c instanceof ForEachStmt - || c instanceof ExpressionStmt - || c instanceof TryStmt; + boolean positionIsFine = c instanceof ForStmt || c instanceof ForEachStmt || c instanceof ExpressionStmt || c instanceof TryStmt; if (!positionIsFine) { reportIllegalPosition(node, reporter); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java index 9b7b821754..4dfda84954 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java @@ -34,7 +34,7 @@ /** * Processes the generic AST into a Java 10 AST and validates it. */ -public class Java10PostProcessor extends PostProcessors { +public class Java10PostProcessor extends PostProcessors { // List of parent contexts in which a var type must not be detected. // for example: in this statement var.class.getCanonicalName(), var must not be considered as a VarType @@ -47,7 +47,7 @@ public class Java10PostProcessor extends PostProcessors { protected final Processor varNodeCreator = new Processor() { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { result.getResult().ifPresent(node -> { node.findAll(ClassOrInterfaceType.class).forEach(n -> { if ("var".equals(n.getNameAsString()) && !matchForbiddenContext(n)) { @@ -58,13 +58,11 @@ public void postProcess(ParseResult result, ParserConfiguration } private boolean matchForbiddenContext(ClassOrInterfaceType cit) { - return cit.getParentNode().isPresent() - && FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.stream() - .anyMatch(cl -> cl.isInstance(cit.getParentNode().get())); + return cit.getParentNode().isPresent() && FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.stream().anyMatch(cl -> cl.isInstance(cit.getParentNode().get())); } }; - public Java10PostProcessor() { + public Java10PostProcessor() { add(varNodeCreator); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java index 961940538b..b7c141d1b2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 11 AST and validates it. */ -public class Java11PostProcessor extends Java10PostProcessor {} +public class Java11PostProcessor extends Java10PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java index b215015055..ed318341ec 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 12 AST and validates it. */ -public class Java12PostProcessor extends Java11PostProcessor {} +public class Java12PostProcessor extends Java11PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java index 0b6879f7d4..e7f107f291 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 13 AST and validates it. */ -public class Java13PostProcessor extends Java12PostProcessor {} +public class Java13PostProcessor extends Java12PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java index f30f6fad99..067069bb89 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 14 AST and validates it. */ -public class Java14PostProcessor extends Java13PostProcessor {} +public class Java14PostProcessor extends Java13PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java index f9495536eb..96a4b2960c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 15 AST and validates it. */ -public class Java15PostProcessor extends Java14PostProcessor {} +public class Java15PostProcessor extends Java14PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java index 33b0f26956..44739dd43e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 16 AST and validates it. */ -public class Java16PostProcessor extends Java15PostProcessor {} +public class Java16PostProcessor extends Java15PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java index f08e93857a..793988291c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java @@ -23,4 +23,5 @@ /** * Processes the generic AST into a Java 17 AST and validates it. */ -public class Java17PostProcessor extends Java16PostProcessor {} +public class Java17PostProcessor extends Java16PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java index 503e148b17..4ee7fff32e 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java @@ -22,4 +22,5 @@ /** * Processes the generic AST into a Java 18 AST and validates it. */ -public class Java18PostProcessor extends Java17PostProcessor {} +public class Java18PostProcessor extends Java17PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java index 814b3e55dd..4121856bb2 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java @@ -22,4 +22,5 @@ /** * Processes the generic AST into a Java 19 AST and validates it. */ -public class Java19PostProcessor extends Java18PostProcessor {} +public class Java19PostProcessor extends Java18PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java index 29a3b29ee5..76a0568cc2 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java @@ -22,4 +22,5 @@ /** * Processes the generic AST into a Java 20 AST and validates it. */ -public class Java20PostProcessor extends Java19PostProcessor {} +public class Java20PostProcessor extends Java19PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java index 23ee9b08f3..6b1227546a 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java @@ -22,4 +22,5 @@ /** * Processes the generic AST into a Java 21 AST and validates it. */ -public class Java21PostProcessor extends Java20PostProcessor {} +public class Java21PostProcessor extends Java20PostProcessor { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/PostProcessors.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/PostProcessors.java index d2662de779..a0e00d9ffb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/PostProcessors.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/PostProcessors.java @@ -31,37 +31,37 @@ /** * A post processor that will call a collection of post processors. */ -public class PostProcessors { +public class PostProcessors { private final List postProcessors = new ArrayList<>(); - public PostProcessors(Processor... postProcessors) { + public PostProcessors(Processor... postProcessors) { this.postProcessors.addAll(Arrays.asList(postProcessors)); } - public List getPostProcessors() { + public List getPostProcessors() { return postProcessors; } - public PostProcessors remove(Processor postProcessor) { + public PostProcessors remove(Processor postProcessor) { if (!postProcessors.remove(postProcessor)) { throw new AssertionError("Trying to remove a post processor that isn't there."); } return this; } - public PostProcessors replace(Processor oldProcessor, Processor newProcessor) { + public PostProcessors replace(Processor oldProcessor, Processor newProcessor) { remove(oldProcessor); add(newProcessor); return this; } - public PostProcessors add(Processor newProcessor) { + public PostProcessors add(Processor newProcessor) { postProcessors.add(newProcessor); return this; } - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { postProcessors.forEach(pp -> pp.postProcess(result, configuration)); } } 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 7ad121387c..217876da0a 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 @@ -21,7 +21,11 @@ package com.github.javaparser.ast.visitor; import java.util.Optional; - +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; import com.github.javaparser.ast.*; import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.comments.BlockComment; @@ -29,25 +33,32 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.clauses.JmlClauseLabel; +import com.github.javaparser.ast.jml.clauses.JmlSignalsClause; +import com.github.javaparser.ast.jml.clauses.JmlSignalsOnlyClause; +import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * A visitor that clones (copies) a node and all its children. */ -public class CloneVisitor implements GenericVisitor { +public class CloneVisitor implements GenericVisitor { @Override @Generated("com.github.javaparser.generator.core.visitor.CloneVisitorGenerator") - public Visitable visit(final CompilationUnit n, final Object arg) { + public Visitable visit(final CompilationUnit n, final Object arg) { NodeList imports = cloneList(n.getImports(), arg); ModuleDeclaration module = cloneNode(n.getModule(), arg); PackageDeclaration packageDeclaration = cloneNode(n.getPackageDeclaration(), arg); NodeList> types = cloneList(n.getTypes(), arg); Comment comment = cloneNode(n.getComment(), arg); - CompilationUnit r = - new CompilationUnit(n.getTokenRange().orElse(null), packageDeclaration, imports, types, module); + CompilationUnit r = new CompilationUnit(n.getTokenRange().orElse(null), packageDeclaration, imports, types, module); n.getStorage().ifPresent(s -> r.setStorage(s.getPath(), s.getEncoding())); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); @@ -57,7 +68,7 @@ public Visitable visit(final CompilationUnit n, final Object arg) { @Override @Generated("com.github.javaparser.generator.core.visitor.CloneVisitorGenerator") - public Visitable visit(final PackageDeclaration n, final Object arg) { + public Visitable visit(final PackageDeclaration n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -69,7 +80,7 @@ public Visitable visit(final PackageDeclaration n, final Object arg) { } @Override - public Visitable visit(final TypeParameter n, final Object arg) { + public Visitable visit(final TypeParameter n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); NodeList typeBound = cloneList(n.getTypeBound(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); @@ -82,7 +93,7 @@ public Visitable visit(final TypeParameter n, final Object arg) { } @Override - public Visitable visit(final LineComment n, final Object arg) { + public Visitable visit(final LineComment n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); LineComment r = new LineComment(n.getTokenRange().orElse(null), n.getContent()); r.setComment(comment); @@ -92,7 +103,7 @@ public Visitable visit(final LineComment n, final Object arg) { } @Override - public Visitable visit(final BlockComment n, final Object arg) { + public Visitable visit(final BlockComment n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); BlockComment r = new BlockComment(n.getTokenRange().orElse(null), n.getContent()); r.setComment(comment); @@ -102,7 +113,7 @@ public Visitable visit(final BlockComment n, final Object arg) { } @Override - public Visitable visit(final ClassOrInterfaceDeclaration n, final Object arg) { + public Visitable visit(final ClassOrInterfaceDeclaration n, final Object arg) { NodeList extendedTypes = cloneList(n.getExtendedTypes(), arg); NodeList implementedTypes = cloneList(n.getImplementedTypes(), arg); NodeList permittedTypes = cloneList(n.getPermittedTypes(), arg); @@ -112,17 +123,7 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration( - n.getTokenRange().orElse(null), - modifiers, - annotations, - n.isInterface(), - name, - typeParameters, - extendedTypes, - implementedTypes, - permittedTypes, - members); + ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, n.isInterface(), name, typeParameters, extendedTypes, implementedTypes, permittedTypes, members); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -130,7 +131,7 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final Object arg) { } @Override - public Visitable visit(final EnumDeclaration n, final Object arg) { + public Visitable visit(final EnumDeclaration n, final Object arg) { NodeList entries = cloneList(n.getEntries(), arg); NodeList implementedTypes = cloneList(n.getImplementedTypes(), arg); NodeList> members = cloneList(n.getMembers(), arg); @@ -138,8 +139,7 @@ public Visitable visit(final EnumDeclaration n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - EnumDeclaration r = new EnumDeclaration( - n.getTokenRange().orElse(null), modifiers, annotations, name, implementedTypes, entries, members); + EnumDeclaration r = new EnumDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, implementedTypes, entries, members); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -147,14 +147,13 @@ public Visitable visit(final EnumDeclaration n, final Object arg) { } @Override - public Visitable visit(final EnumConstantDeclaration n, final Object arg) { + public Visitable visit(final EnumConstantDeclaration n, final Object arg) { NodeList arguments = cloneList(n.getArguments(), arg); NodeList> classBody = cloneList(n.getClassBody(), arg); SimpleName name = cloneNode(n.getName(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - EnumConstantDeclaration r = - new EnumConstantDeclaration(n.getTokenRange().orElse(null), annotations, name, arguments, classBody); + EnumConstantDeclaration r = new EnumConstantDeclaration(n.getTokenRange().orElse(null), annotations, name, arguments, classBody); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -162,14 +161,13 @@ public Visitable visit(final EnumConstantDeclaration n, final Object arg) { } @Override - public Visitable visit(final AnnotationDeclaration n, final Object arg) { + public Visitable visit(final AnnotationDeclaration n, final Object arg) { NodeList> members = cloneList(n.getMembers(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); SimpleName name = cloneNode(n.getName(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - AnnotationDeclaration r = - new AnnotationDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, members); + AnnotationDeclaration r = new AnnotationDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, members); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -177,15 +175,14 @@ public Visitable visit(final AnnotationDeclaration n, final Object arg) { } @Override - public Visitable visit(final AnnotationMemberDeclaration n, final Object arg) { + public Visitable visit(final AnnotationMemberDeclaration n, final Object arg) { Expression defaultValue = cloneNode(n.getDefaultValue(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); SimpleName name = cloneNode(n.getName(), arg); Type type = cloneNode(n.getType(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - AnnotationMemberDeclaration r = new AnnotationMemberDeclaration( - n.getTokenRange().orElse(null), modifiers, annotations, type, name, defaultValue); + AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, type, name, defaultValue); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -193,7 +190,7 @@ public Visitable visit(final AnnotationMemberDeclaration n, final Object arg) { } @Override - public Visitable visit(final FieldDeclaration n, final Object arg) { + public Visitable visit(final FieldDeclaration n, final Object arg) { NodeList modifiers = cloneList(n.getModifiers(), arg); NodeList variables = cloneList(n.getVariables(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); @@ -206,7 +203,7 @@ public Visitable visit(final FieldDeclaration n, final Object arg) { } @Override - public Visitable visit(final VariableDeclarator n, final Object arg) { + public Visitable visit(final VariableDeclarator n, final Object arg) { Expression initializer = cloneNode(n.getInitializer(), arg); SimpleName name = cloneNode(n.getName(), arg); Type type = cloneNode(n.getType(), arg); @@ -219,7 +216,7 @@ public Visitable visit(final VariableDeclarator n, final Object arg) { } @Override - public Visitable visit(final ConstructorDeclaration n, final Object arg) { + public Visitable visit(final ConstructorDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); NodeList contracts = cloneList(n.getContracts(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); @@ -230,16 +227,7 @@ public Visitable visit(final ConstructorDeclaration n, final Object arg) { NodeList typeParameters = cloneList(n.getTypeParameters(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - ConstructorDeclaration r = new ConstructorDeclaration( - n.getTokenRange().orElse(null), - modifiers, - annotations, - typeParameters, - name, - parameters, - thrownExceptions, - body, - receiverParameter); + ConstructorDeclaration r = new ConstructorDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, contracts); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -247,7 +235,7 @@ public Visitable visit(final ConstructorDeclaration n, final Object arg) { } @Override - public Visitable visit(final MethodDeclaration n, final Object arg) { + public Visitable visit(final MethodDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); Type type = cloneNode(n.getType(), arg); NodeList contracts = cloneList(n.getContracts(), arg); @@ -259,17 +247,7 @@ public Visitable visit(final MethodDeclaration n, final Object arg) { NodeList typeParameters = cloneList(n.getTypeParameters(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - MethodDeclaration r = new MethodDeclaration( - n.getTokenRange().orElse(null), - modifiers, - annotations, - typeParameters, - type, - name, - parameters, - thrownExceptions, - body, - receiverParameter); + MethodDeclaration r = new MethodDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, contracts); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -277,15 +255,14 @@ public Visitable visit(final MethodDeclaration n, final Object arg) { } @Override - public Visitable visit(final Parameter n, final Object arg) { + public Visitable visit(final Parameter n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); SimpleName name = cloneNode(n.getName(), arg); Type type = cloneNode(n.getType(), arg); NodeList varArgsAnnotations = cloneList(n.getVarArgsAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - Parameter r = new Parameter( - n.getTokenRange().orElse(null), modifiers, annotations, type, n.isVarArgs(), varArgsAnnotations, name); + Parameter r = new Parameter(n.getTokenRange().orElse(null), modifiers, annotations, type, n.isVarArgs(), varArgsAnnotations, name); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -293,7 +270,7 @@ public Visitable visit(final Parameter n, final Object arg) { } @Override - public Visitable visit(final InitializerDeclaration n, final Object arg) { + public Visitable visit(final InitializerDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -305,7 +282,7 @@ public Visitable visit(final InitializerDeclaration n, final Object arg) { } @Override - public Visitable visit(final JavadocComment n, final Object arg) { + public Visitable visit(final JavadocComment n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); JavadocComment r = new JavadocComment(n.getTokenRange().orElse(null), n.getContent()); r.setComment(comment); @@ -315,14 +292,13 @@ public Visitable visit(final JavadocComment n, final Object arg) { } @Override - public Visitable visit(final ClassOrInterfaceType n, final Object arg) { + public Visitable visit(final ClassOrInterfaceType n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); ClassOrInterfaceType scope = cloneNode(n.getScope(), arg); NodeList typeArguments = cloneList(n.getTypeArguments().orElse(null), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - ClassOrInterfaceType r = - new ClassOrInterfaceType(n.getTokenRange().orElse(null), scope, name, typeArguments, annotations); + ClassOrInterfaceType r = new ClassOrInterfaceType(n.getTokenRange().orElse(null), scope, name, typeArguments, annotations); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -330,7 +306,7 @@ public Visitable visit(final ClassOrInterfaceType n, final Object arg) { } @Override - public Visitable visit(final PrimitiveType n, final Object arg) { + public Visitable visit(final PrimitiveType n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); PrimitiveType r = new PrimitiveType(n.getTokenRange().orElse(null), n.getType(), annotations); @@ -341,7 +317,7 @@ public Visitable visit(final PrimitiveType n, final Object arg) { } @Override - public Visitable visit(final ArrayType n, final Object arg) { + public Visitable visit(final ArrayType n, final Object arg) { Type componentType = cloneNode(n.getComponentType(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -353,7 +329,7 @@ public Visitable visit(final ArrayType n, final Object arg) { } @Override - public Visitable visit(final ArrayCreationLevel n, final Object arg) { + public Visitable visit(final ArrayCreationLevel n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Expression dimension = cloneNode(n.getDimension(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -365,7 +341,7 @@ public Visitable visit(final ArrayCreationLevel n, final Object arg) { } @Override - public Visitable visit(final IntersectionType n, final Object arg) { + public Visitable visit(final IntersectionType n, final Object arg) { NodeList elements = cloneList(n.getElements(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -377,7 +353,7 @@ public Visitable visit(final IntersectionType n, final Object arg) { } @Override - public Visitable visit(final UnionType n, final Object arg) { + public Visitable visit(final UnionType n, final Object arg) { NodeList elements = cloneList(n.getElements(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -389,7 +365,7 @@ public Visitable visit(final UnionType n, final Object arg) { } @Override - public Visitable visit(final VoidType n, final Object arg) { + public Visitable visit(final VoidType n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); VoidType r = new VoidType(n.getTokenRange().orElse(null)); @@ -400,7 +376,7 @@ public Visitable visit(final VoidType n, final Object arg) { } @Override - public Visitable visit(final WildcardType n, final Object arg) { + public Visitable visit(final WildcardType n, final Object arg) { ReferenceType extendedType = cloneNode(n.getExtendedType(), arg); ReferenceType superType = cloneNode(n.getSuperType(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); @@ -413,7 +389,7 @@ public Visitable visit(final WildcardType n, final Object arg) { } @Override - public Visitable visit(final UnknownType n, final Object arg) { + public Visitable visit(final UnknownType n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); UnknownType r = new UnknownType(n.getTokenRange().orElse(null)); @@ -424,7 +400,7 @@ public Visitable visit(final UnknownType n, final Object arg) { } @Override - public Visitable visit(final ArrayAccessExpr n, final Object arg) { + public Visitable visit(final ArrayAccessExpr n, final Object arg) { Expression index = cloneNode(n.getIndex(), arg); Expression name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -436,7 +412,7 @@ public Visitable visit(final ArrayAccessExpr n, final Object arg) { } @Override - public Visitable visit(final ArrayCreationExpr n, final Object arg) { + public Visitable visit(final ArrayCreationExpr n, final Object arg) { Type elementType = cloneNode(n.getElementType(), arg); ArrayInitializerExpr initializer = cloneNode(n.getInitializer(), arg); NodeList levels = cloneList(n.getLevels(), arg); @@ -449,7 +425,7 @@ public Visitable visit(final ArrayCreationExpr n, final Object arg) { } @Override - public Visitable visit(final ArrayInitializerExpr n, final Object arg) { + public Visitable visit(final ArrayInitializerExpr n, final Object arg) { NodeList values = cloneList(n.getValues(), arg); Comment comment = cloneNode(n.getComment(), arg); ArrayInitializerExpr r = new ArrayInitializerExpr(n.getTokenRange().orElse(null), values); @@ -460,7 +436,7 @@ public Visitable visit(final ArrayInitializerExpr n, final Object arg) { } @Override - public Visitable visit(final AssignExpr n, final Object arg) { + public Visitable visit(final AssignExpr n, final Object arg) { Expression target = cloneNode(n.getTarget(), arg); Expression value = cloneNode(n.getValue(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -472,7 +448,7 @@ public Visitable visit(final AssignExpr n, final Object arg) { } @Override - public Visitable visit(final BinaryExpr n, final Object arg) { + public Visitable visit(final BinaryExpr n, final Object arg) { Expression left = cloneNode(n.getLeft(), arg); Expression right = cloneNode(n.getRight(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -484,7 +460,7 @@ public Visitable visit(final BinaryExpr n, final Object arg) { } @Override - public Visitable visit(final CastExpr n, final Object arg) { + public Visitable visit(final CastExpr n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Type type = cloneNode(n.getType(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -496,7 +472,7 @@ public Visitable visit(final CastExpr n, final Object arg) { } @Override - public Visitable visit(final ClassExpr n, final Object arg) { + public Visitable visit(final ClassExpr n, final Object arg) { Type type = cloneNode(n.getType(), arg); Comment comment = cloneNode(n.getComment(), arg); ClassExpr r = new ClassExpr(n.getTokenRange().orElse(null), type); @@ -507,7 +483,7 @@ public Visitable visit(final ClassExpr n, final Object arg) { } @Override - public Visitable visit(final ConditionalExpr n, final Object arg) { + public Visitable visit(final ConditionalExpr n, final Object arg) { Expression condition = cloneNode(n.getCondition(), arg); Expression elseExpr = cloneNode(n.getElseExpr(), arg); Expression thenExpr = cloneNode(n.getThenExpr(), arg); @@ -520,7 +496,7 @@ public Visitable visit(final ConditionalExpr n, final Object arg) { } @Override - public Visitable visit(final EnclosedExpr n, final Object arg) { + public Visitable visit(final EnclosedExpr n, final Object arg) { Expression inner = cloneNode(n.getInner(), arg); Comment comment = cloneNode(n.getComment(), arg); EnclosedExpr r = new EnclosedExpr(n.getTokenRange().orElse(null), inner); @@ -531,7 +507,7 @@ public Visitable visit(final EnclosedExpr n, final Object arg) { } @Override - public Visitable visit(final FieldAccessExpr n, final Object arg) { + public Visitable visit(final FieldAccessExpr n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); Expression scope = cloneNode(n.getScope(), arg); NodeList typeArguments = cloneList(n.getTypeArguments().orElse(null), arg); @@ -544,7 +520,7 @@ public Visitable visit(final FieldAccessExpr n, final Object arg) { } @Override - public Visitable visit(final InstanceOfExpr n, final Object arg) { + public Visitable visit(final InstanceOfExpr n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); PatternExpr pattern = cloneNode(n.getPattern(), arg); ReferenceType type = cloneNode(n.getType(), arg); @@ -557,7 +533,7 @@ public Visitable visit(final InstanceOfExpr n, final Object arg) { } @Override - public Visitable visit(final StringLiteralExpr n, final Object arg) { + public Visitable visit(final StringLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); StringLiteralExpr r = new StringLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -567,7 +543,7 @@ public Visitable visit(final StringLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final IntegerLiteralExpr n, final Object arg) { + public Visitable visit(final IntegerLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); IntegerLiteralExpr r = new IntegerLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -577,7 +553,7 @@ public Visitable visit(final IntegerLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final LongLiteralExpr n, final Object arg) { + public Visitable visit(final LongLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); LongLiteralExpr r = new LongLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -587,7 +563,7 @@ public Visitable visit(final LongLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final CharLiteralExpr n, final Object arg) { + public Visitable visit(final CharLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); CharLiteralExpr r = new CharLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -597,7 +573,7 @@ public Visitable visit(final CharLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final DoubleLiteralExpr n, final Object arg) { + public Visitable visit(final DoubleLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); DoubleLiteralExpr r = new DoubleLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -607,7 +583,7 @@ public Visitable visit(final DoubleLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final BooleanLiteralExpr n, final Object arg) { + public Visitable visit(final BooleanLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); BooleanLiteralExpr r = new BooleanLiteralExpr(n.getTokenRange().orElse(null), n.isValue()); r.setComment(comment); @@ -617,7 +593,7 @@ public Visitable visit(final BooleanLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final NullLiteralExpr n, final Object arg) { + public Visitable visit(final NullLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); NullLiteralExpr r = new NullLiteralExpr(n.getTokenRange().orElse(null)); r.setComment(comment); @@ -627,7 +603,7 @@ public Visitable visit(final NullLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final MethodCallExpr n, final Object arg) { + public Visitable visit(final MethodCallExpr n, final Object arg) { NodeList arguments = cloneList(n.getArguments(), arg); SimpleName name = cloneNode(n.getName(), arg); Expression scope = cloneNode(n.getScope(), arg); @@ -641,7 +617,7 @@ public Visitable visit(final MethodCallExpr n, final Object arg) { } @Override - public Visitable visit(final NameExpr n, final Object arg) { + public Visitable visit(final NameExpr n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); NameExpr r = new NameExpr(n.getTokenRange().orElse(null), name); @@ -652,16 +628,14 @@ public Visitable visit(final NameExpr n, final Object arg) { } @Override - public Visitable visit(final ObjectCreationExpr n, final Object arg) { - NodeList> anonymousClassBody = - cloneList(n.getAnonymousClassBody().orElse(null), arg); + public Visitable visit(final ObjectCreationExpr n, final Object arg) { + NodeList> anonymousClassBody = cloneList(n.getAnonymousClassBody().orElse(null), arg); NodeList arguments = cloneList(n.getArguments(), arg); Expression scope = cloneNode(n.getScope(), arg); ClassOrInterfaceType type = cloneNode(n.getType(), arg); NodeList typeArguments = cloneList(n.getTypeArguments().orElse(null), arg); Comment comment = cloneNode(n.getComment(), arg); - ObjectCreationExpr r = new ObjectCreationExpr( - n.getTokenRange().orElse(null), scope, type, typeArguments, arguments, anonymousClassBody); + ObjectCreationExpr r = new ObjectCreationExpr(n.getTokenRange().orElse(null), scope, type, typeArguments, arguments, anonymousClassBody); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -669,7 +643,7 @@ public Visitable visit(final ObjectCreationExpr n, final Object arg) { } @Override - public Visitable visit(final Name n, final Object arg) { + public Visitable visit(final Name n, final Object arg) { Name qualifier = cloneNode(n.getQualifier(), arg); Comment comment = cloneNode(n.getComment(), arg); Name r = new Name(n.getTokenRange().orElse(null), qualifier, n.getIdentifier()); @@ -680,7 +654,7 @@ public Visitable visit(final Name n, final Object arg) { } @Override - public Visitable visit(final SimpleName n, final Object arg) { + public Visitable visit(final SimpleName n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); SimpleName r = new SimpleName(n.getTokenRange().orElse(null), n.getIdentifier()); r.setComment(comment); @@ -690,7 +664,7 @@ public Visitable visit(final SimpleName n, final Object arg) { } @Override - public Visitable visit(final ThisExpr n, final Object arg) { + public Visitable visit(final ThisExpr n, final Object arg) { Name typeName = cloneNode(n.getTypeName(), arg); Comment comment = cloneNode(n.getComment(), arg); ThisExpr r = new ThisExpr(n.getTokenRange().orElse(null), typeName); @@ -701,7 +675,7 @@ public Visitable visit(final ThisExpr n, final Object arg) { } @Override - public Visitable visit(final SuperExpr n, final Object arg) { + public Visitable visit(final SuperExpr n, final Object arg) { Name typeName = cloneNode(n.getTypeName(), arg); Comment comment = cloneNode(n.getComment(), arg); SuperExpr r = new SuperExpr(n.getTokenRange().orElse(null), typeName); @@ -712,7 +686,7 @@ public Visitable visit(final SuperExpr n, final Object arg) { } @Override - public Visitable visit(final UnaryExpr n, final Object arg) { + public Visitable visit(final UnaryExpr n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); UnaryExpr r = new UnaryExpr(n.getTokenRange().orElse(null), expression, n.getOperator()); @@ -723,13 +697,12 @@ public Visitable visit(final UnaryExpr n, final Object arg) { } @Override - public Visitable visit(final VariableDeclarationExpr n, final Object arg) { + public Visitable visit(final VariableDeclarationExpr n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); NodeList variables = cloneList(n.getVariables(), arg); Comment comment = cloneNode(n.getComment(), arg); - VariableDeclarationExpr r = - new VariableDeclarationExpr(n.getTokenRange().orElse(null), modifiers, annotations, variables); + VariableDeclarationExpr r = new VariableDeclarationExpr(n.getTokenRange().orElse(null), modifiers, annotations, variables); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -737,7 +710,7 @@ public Visitable visit(final VariableDeclarationExpr n, final Object arg) { } @Override - public Visitable visit(final MarkerAnnotationExpr n, final Object arg) { + public Visitable visit(final MarkerAnnotationExpr n, final Object arg) { Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); MarkerAnnotationExpr r = new MarkerAnnotationExpr(n.getTokenRange().orElse(null), name); @@ -748,12 +721,11 @@ public Visitable visit(final MarkerAnnotationExpr n, final Object arg) { } @Override - public Visitable visit(final SingleMemberAnnotationExpr n, final Object arg) { + public Visitable visit(final SingleMemberAnnotationExpr n, final Object arg) { Expression memberValue = cloneNode(n.getMemberValue(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); - SingleMemberAnnotationExpr r = - new SingleMemberAnnotationExpr(n.getTokenRange().orElse(null), name, memberValue); + SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(n.getTokenRange().orElse(null), name, memberValue); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -761,7 +733,7 @@ public Visitable visit(final SingleMemberAnnotationExpr n, final Object arg) { } @Override - public Visitable visit(final NormalAnnotationExpr n, final Object arg) { + public Visitable visit(final NormalAnnotationExpr n, final Object arg) { NodeList pairs = cloneList(n.getPairs(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -773,7 +745,7 @@ public Visitable visit(final NormalAnnotationExpr n, final Object arg) { } @Override - public Visitable visit(final MemberValuePair n, final Object arg) { + public Visitable visit(final MemberValuePair n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); Expression value = cloneNode(n.getValue(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -785,13 +757,12 @@ public Visitable visit(final MemberValuePair n, final Object arg) { } @Override - public Visitable visit(final ExplicitConstructorInvocationStmt n, final Object arg) { + public Visitable visit(final ExplicitConstructorInvocationStmt n, final Object arg) { NodeList arguments = cloneList(n.getArguments(), arg); Expression expression = cloneNode(n.getExpression(), arg); NodeList typeArguments = cloneList(n.getTypeArguments().orElse(null), arg); Comment comment = cloneNode(n.getComment(), arg); - ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt( - n.getTokenRange().orElse(null), typeArguments, n.isThis(), expression, arguments); + ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(n.getTokenRange().orElse(null), typeArguments, n.isThis(), expression, arguments); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -799,11 +770,10 @@ public Visitable visit(final ExplicitConstructorInvocationStmt n, final Object a } @Override - public Visitable visit(final LocalClassDeclarationStmt n, final Object arg) { + public Visitable visit(final LocalClassDeclarationStmt n, final Object arg) { ClassOrInterfaceDeclaration classDeclaration = cloneNode(n.getClassDeclaration(), arg); Comment comment = cloneNode(n.getComment(), arg); - LocalClassDeclarationStmt r = - new LocalClassDeclarationStmt(n.getTokenRange().orElse(null), classDeclaration); + LocalClassDeclarationStmt r = new LocalClassDeclarationStmt(n.getTokenRange().orElse(null), classDeclaration); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -811,11 +781,10 @@ public Visitable visit(final LocalClassDeclarationStmt n, final Object arg) { } @Override - public Visitable visit(final LocalRecordDeclarationStmt n, final Object arg) { + public Visitable visit(final LocalRecordDeclarationStmt n, final Object arg) { RecordDeclaration recordDeclaration = cloneNode(n.getRecordDeclaration(), arg); Comment comment = cloneNode(n.getComment(), arg); - LocalRecordDeclarationStmt r = - new LocalRecordDeclarationStmt(n.getTokenRange().orElse(null), recordDeclaration); + LocalRecordDeclarationStmt r = new LocalRecordDeclarationStmt(n.getTokenRange().orElse(null), recordDeclaration); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -823,7 +792,7 @@ public Visitable visit(final LocalRecordDeclarationStmt n, final Object arg) { } @Override - public Visitable visit(final AssertStmt n, final Object arg) { + public Visitable visit(final AssertStmt n, final Object arg) { Expression check = cloneNode(n.getCheck(), arg); Expression message = cloneNode(n.getMessage(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -835,7 +804,7 @@ public Visitable visit(final AssertStmt n, final Object arg) { } @Override - public Visitable visit(final BlockStmt n, final Object arg) { + public Visitable visit(final BlockStmt n, final Object arg) { NodeList contracts = cloneList(n.getContracts(), arg); NodeList statements = cloneList(n.getStatements(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -847,7 +816,7 @@ public Visitable visit(final BlockStmt n, final Object arg) { } @Override - public Visitable visit(final LabeledStmt n, final Object arg) { + public Visitable visit(final LabeledStmt n, final Object arg) { SimpleName label = cloneNode(n.getLabel(), arg); Statement statement = cloneNode(n.getStatement(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -859,7 +828,7 @@ public Visitable visit(final LabeledStmt n, final Object arg) { } @Override - public Visitable visit(final EmptyStmt n, final Object arg) { + public Visitable visit(final EmptyStmt n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); EmptyStmt r = new EmptyStmt(n.getTokenRange().orElse(null)); r.setComment(comment); @@ -869,7 +838,7 @@ public Visitable visit(final EmptyStmt n, final Object arg) { } @Override - public Visitable visit(final ExpressionStmt n, final Object arg) { + public Visitable visit(final ExpressionStmt n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); ExpressionStmt r = new ExpressionStmt(n.getTokenRange().orElse(null), expression); @@ -880,7 +849,7 @@ public Visitable visit(final ExpressionStmt n, final Object arg) { } @Override - public Visitable visit(final SwitchStmt n, final Object arg) { + public Visitable visit(final SwitchStmt n, final Object arg) { NodeList entries = cloneList(n.getEntries(), arg); Expression selector = cloneNode(n.getSelector(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -892,7 +861,7 @@ public Visitable visit(final SwitchStmt n, final Object arg) { } @Override - public Visitable visit(final SwitchEntry n, final Object arg) { + public Visitable visit(final SwitchEntry n, final Object arg) { Expression guard = cloneNode(n.getGuard(), arg); NodeList labels = cloneList(n.getLabels(), arg); NodeList statements = cloneList(n.getStatements(), arg); @@ -905,7 +874,7 @@ public Visitable visit(final SwitchEntry n, final Object arg) { } @Override - public Visitable visit(final BreakStmt n, final Object arg) { + public Visitable visit(final BreakStmt n, final Object arg) { SimpleName label = cloneNode(n.getLabel(), arg); Comment comment = cloneNode(n.getComment(), arg); BreakStmt r = new BreakStmt(n.getTokenRange().orElse(null), label); @@ -916,7 +885,7 @@ public Visitable visit(final BreakStmt n, final Object arg) { } @Override - public Visitable visit(final ReturnStmt n, final Object arg) { + public Visitable visit(final ReturnStmt n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); ReturnStmt r = new ReturnStmt(n.getTokenRange().orElse(null), expression); @@ -927,7 +896,7 @@ public Visitable visit(final ReturnStmt n, final Object arg) { } @Override - public Visitable visit(final IfStmt n, final Object arg) { + public Visitable visit(final IfStmt n, final Object arg) { Expression condition = cloneNode(n.getCondition(), arg); Statement elseStmt = cloneNode(n.getElseStmt(), arg); Statement thenStmt = cloneNode(n.getThenStmt(), arg); @@ -940,7 +909,7 @@ public Visitable visit(final IfStmt n, final Object arg) { } @Override - public Visitable visit(final WhileStmt n, final Object arg) { + public Visitable visit(final WhileStmt n, final Object arg) { Statement body = cloneNode(n.getBody(), arg); Expression condition = cloneNode(n.getCondition(), arg); NodeList contracts = cloneList(n.getContracts(), arg); @@ -953,7 +922,7 @@ public Visitable visit(final WhileStmt n, final Object arg) { } @Override - public Visitable visit(final ContinueStmt n, final Object arg) { + public Visitable visit(final ContinueStmt n, final Object arg) { SimpleName label = cloneNode(n.getLabel(), arg); Comment comment = cloneNode(n.getComment(), arg); ContinueStmt r = new ContinueStmt(n.getTokenRange().orElse(null), label); @@ -964,7 +933,7 @@ public Visitable visit(final ContinueStmt n, final Object arg) { } @Override - public Visitable visit(final DoStmt n, final Object arg) { + public Visitable visit(final DoStmt n, final Object arg) { Statement body = cloneNode(n.getBody(), arg); Expression condition = cloneNode(n.getCondition(), arg); NodeList contracts = cloneList(n.getContracts(), arg); @@ -977,7 +946,7 @@ public Visitable visit(final DoStmt n, final Object arg) { } @Override - public Visitable visit(final ForEachStmt n, final Object arg) { + public Visitable visit(final ForEachStmt n, final Object arg) { Statement body = cloneNode(n.getBody(), arg); NodeList contracts = cloneList(n.getContracts(), arg); Expression iterable = cloneNode(n.getIterable(), arg); @@ -991,7 +960,7 @@ public Visitable visit(final ForEachStmt n, final Object arg) { } @Override - public Visitable visit(final ForStmt n, final Object arg) { + public Visitable visit(final ForStmt n, final Object arg) { Statement body = cloneNode(n.getBody(), arg); Expression compare = cloneNode(n.getCompare(), arg); NodeList contracts = cloneList(n.getContracts(), arg); @@ -1006,7 +975,7 @@ public Visitable visit(final ForStmt n, final Object arg) { } @Override - public Visitable visit(final ThrowStmt n, final Object arg) { + public Visitable visit(final ThrowStmt n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); ThrowStmt r = new ThrowStmt(n.getTokenRange().orElse(null), expression); @@ -1017,7 +986,7 @@ public Visitable visit(final ThrowStmt n, final Object arg) { } @Override - public Visitable visit(final SynchronizedStmt n, final Object arg) { + public Visitable visit(final SynchronizedStmt n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1029,7 +998,7 @@ public Visitable visit(final SynchronizedStmt n, final Object arg) { } @Override - public Visitable visit(final TryStmt n, final Object arg) { + public Visitable visit(final TryStmt n, final Object arg) { NodeList catchClauses = cloneList(n.getCatchClauses(), arg); BlockStmt finallyBlock = cloneNode(n.getFinallyBlock(), arg); NodeList resources = cloneList(n.getResources(), arg); @@ -1043,7 +1012,7 @@ public Visitable visit(final TryStmt n, final Object arg) { } @Override - public Visitable visit(final CatchClause n, final Object arg) { + public Visitable visit(final CatchClause n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); Parameter parameter = cloneNode(n.getParameter(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1055,7 +1024,7 @@ public Visitable visit(final CatchClause n, final Object arg) { } @Override - public Visitable visit(final LambdaExpr n, final Object arg) { + public Visitable visit(final LambdaExpr n, final Object arg) { Statement body = cloneNode(n.getBody(), arg); NodeList contracts = cloneList(n.getContracts(), arg); NodeList parameters = cloneList(n.getParameters(), arg); @@ -1068,12 +1037,11 @@ public Visitable visit(final LambdaExpr n, final Object arg) { } @Override - public Visitable visit(final MethodReferenceExpr n, final Object arg) { + public Visitable visit(final MethodReferenceExpr n, final Object arg) { Expression scope = cloneNode(n.getScope(), arg); NodeList typeArguments = cloneList(n.getTypeArguments().orElse(null), arg); Comment comment = cloneNode(n.getComment(), arg); - MethodReferenceExpr r = - new MethodReferenceExpr(n.getTokenRange().orElse(null), scope, typeArguments, n.getIdentifier()); + MethodReferenceExpr r = new MethodReferenceExpr(n.getTokenRange().orElse(null), scope, typeArguments, n.getIdentifier()); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1081,7 +1049,7 @@ public Visitable visit(final MethodReferenceExpr n, final Object arg) { } @Override - public Visitable visit(final TypeExpr n, final Object arg) { + public Visitable visit(final TypeExpr n, final Object arg) { Type type = cloneNode(n.getType(), arg); Comment comment = cloneNode(n.getComment(), arg); TypeExpr r = new TypeExpr(n.getTokenRange().orElse(null), type); @@ -1092,7 +1060,7 @@ public Visitable visit(final TypeExpr n, final Object arg) { } @Override - public Visitable visit(NodeList n, Object arg) { + public Visitable visit(NodeList n, Object arg) { NodeList newNodes = new NodeList<>(); for (Object node : n) { Node resultNode = (Node) ((Node) node).accept(this, arg); @@ -1104,7 +1072,7 @@ public Visitable visit(NodeList n, Object arg) { } @Override - public Node visit(final ImportDeclaration n, final Object arg) { + public Node visit(final ImportDeclaration n, final Object arg) { Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); ImportDeclaration r = new ImportDeclaration(n.getTokenRange().orElse(null), name, n.isStatic(), n.isAsterisk(), n.isJmlModel()); @@ -1115,13 +1083,12 @@ public Node visit(final ImportDeclaration n, final Object arg) { } @Override - public Visitable visit(final ModuleDeclaration n, final Object arg) { + public Visitable visit(final ModuleDeclaration n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); NodeList directives = cloneList(n.getDirectives(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); - ModuleDeclaration r = - new ModuleDeclaration(n.getTokenRange().orElse(null), annotations, name, n.isOpen(), directives); + ModuleDeclaration r = new ModuleDeclaration(n.getTokenRange().orElse(null), annotations, name, n.isOpen(), directives); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1129,12 +1096,11 @@ public Visitable visit(final ModuleDeclaration n, final Object arg) { } @Override - public Visitable visit(final ModuleRequiresDirective n, final Object arg) { + public Visitable visit(final ModuleRequiresDirective n, final Object arg) { NodeList modifiers = cloneList(n.getModifiers(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); - ModuleRequiresDirective r = - new ModuleRequiresDirective(n.getTokenRange().orElse(null), modifiers, name); + ModuleRequiresDirective r = new ModuleRequiresDirective(n.getTokenRange().orElse(null), modifiers, name); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1173,7 +1139,7 @@ private NodeList cloneList(NodeList list, Object arg) { } @Override - public Visitable visit(final ModuleExportsDirective n, final Object arg) { + public Visitable visit(final ModuleExportsDirective n, final Object arg) { NodeList moduleNames = cloneList(n.getModuleNames(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1185,12 +1151,11 @@ public Visitable visit(final ModuleExportsDirective n, final Object arg) { } @Override - public Visitable visit(final ModuleProvidesDirective n, final Object arg) { + public Visitable visit(final ModuleProvidesDirective n, final Object arg) { Name name = cloneNode(n.getName(), arg); NodeList with = cloneList(n.getWith(), arg); Comment comment = cloneNode(n.getComment(), arg); - ModuleProvidesDirective r = - new ModuleProvidesDirective(n.getTokenRange().orElse(null), name, with); + ModuleProvidesDirective r = new ModuleProvidesDirective(n.getTokenRange().orElse(null), name, with); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1198,7 +1163,7 @@ public Visitable visit(final ModuleProvidesDirective n, final Object arg) { } @Override - public Visitable visit(final ModuleUsesDirective n, final Object arg) { + public Visitable visit(final ModuleUsesDirective n, final Object arg) { Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); ModuleUsesDirective r = new ModuleUsesDirective(n.getTokenRange().orElse(null), name); @@ -1209,7 +1174,7 @@ public Visitable visit(final ModuleUsesDirective n, final Object arg) { } @Override - public Visitable visit(final ModuleOpensDirective n, final Object arg) { + public Visitable visit(final ModuleOpensDirective n, final Object arg) { NodeList moduleNames = cloneList(n.getModuleNames(), arg); Name name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1221,7 +1186,7 @@ public Visitable visit(final ModuleOpensDirective n, final Object arg) { } @Override - public Visitable visit(final UnparsableStmt n, final Object arg) { + public Visitable visit(final UnparsableStmt n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); UnparsableStmt r = new UnparsableStmt(n.getTokenRange().orElse(null)); r.setComment(comment); @@ -1231,7 +1196,7 @@ public Visitable visit(final UnparsableStmt n, final Object arg) { } @Override - public Visitable visit(final ReceiverParameter n, final Object arg) { + public Visitable visit(final ReceiverParameter n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Name name = cloneNode(n.getName(), arg); Type type = cloneNode(n.getType(), arg); @@ -1244,7 +1209,7 @@ public Visitable visit(final ReceiverParameter n, final Object arg) { } @Override - public Visitable visit(final VarType n, final Object arg) { + public Visitable visit(final VarType n, final Object arg) { NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); VarType r = new VarType(n.getTokenRange().orElse(null)); @@ -1255,7 +1220,7 @@ public Visitable visit(final VarType n, final Object arg) { } @Override - public Visitable visit(final Modifier n, final Object arg) { + public Visitable visit(final Modifier n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); Modifier r = new Modifier(n.getTokenRange().orElse(null), n.getKeyword()); r.setComment(comment); @@ -1265,7 +1230,7 @@ public Visitable visit(final Modifier n, final Object arg) { } @Override - public Visitable visit(final SwitchExpr n, final Object arg) { + public Visitable visit(final SwitchExpr n, final Object arg) { NodeList entries = cloneList(n.getEntries(), arg); Expression selector = cloneNode(n.getSelector(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1283,7 +1248,7 @@ private void copyData(Node source, Node destination) { } @Override - public Visitable visit(final YieldStmt n, final Object arg) { + public Visitable visit(final YieldStmt n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Comment comment = cloneNode(n.getComment(), arg); YieldStmt r = new YieldStmt(n.getTokenRange().orElse(null), expression); @@ -1294,7 +1259,7 @@ public Visitable visit(final YieldStmt n, final Object arg) { } @Override - public Visitable visit(final TextBlockLiteralExpr n, final Object arg) { + public Visitable visit(final TextBlockLiteralExpr n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); TextBlockLiteralExpr r = new TextBlockLiteralExpr(n.getTokenRange().orElse(null), n.getValue()); r.setComment(comment); @@ -1304,7 +1269,7 @@ public Visitable visit(final TextBlockLiteralExpr n, final Object arg) { } @Override - public Visitable visit(final TypePatternExpr n, final Object arg) { + public Visitable visit(final TypePatternExpr n, final Object arg) { NodeList modifiers = cloneList(n.getModifiers(), arg); SimpleName name = cloneNode(n.getName(), arg); Type type = cloneNode(n.getType(), arg); @@ -1317,7 +1282,7 @@ public Visitable visit(final TypePatternExpr n, final Object arg) { } @Override - public Visitable visit(final JmlQuantifiedExpr n, final Object arg) { + public Visitable visit(final JmlQuantifiedExpr n, final Object arg) { NodeList expressions = cloneList(n.getExpressions(), arg); NodeList variables = cloneList(n.getVariables(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1329,7 +1294,7 @@ public Visitable visit(final JmlQuantifiedExpr n, final Object arg) { } @Override - public Visitable visit(final JmlClauseLabel n, final Object arg) { + public Visitable visit(final JmlClauseLabel n, final Object arg) { Expression expr = cloneNode(n.getExpr(), arg); SimpleName label = cloneNode(n.getLabel(), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1342,7 +1307,7 @@ public Visitable visit(final JmlClauseLabel n, final Object arg) { } @Override - public Visitable visit(final JmlExpressionStmt n, final Object arg) { + public Visitable visit(final JmlExpressionStmt n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1354,7 +1319,7 @@ public Visitable visit(final JmlExpressionStmt n, final Object arg) { } @Override - public Visitable visit(final JmlLabelExpr n, final Object arg) { + public Visitable visit(final JmlLabelExpr n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); SimpleName label = cloneNode(n.getLabel(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1366,7 +1331,7 @@ public Visitable visit(final JmlLabelExpr n, final Object arg) { } @Override - public Visitable visit(final JmlLetExpr n, final Object arg) { + public Visitable visit(final JmlLetExpr n, final Object arg) { Expression body = cloneNode(n.getBody(), arg); VariableDeclarationExpr variables = cloneNode(n.getVariables(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1378,7 +1343,7 @@ public Visitable visit(final JmlLetExpr n, final Object arg) { } @Override - public Visitable visit(final JmlMultiCompareExpr n, final Object arg) { + public Visitable visit(final JmlMultiCompareExpr n, final Object arg) { NodeList expressions = cloneList(n.getExpressions(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlMultiCompareExpr r = new JmlMultiCompareExpr(n.getTokenRange().orElse(null), expressions, n.getOperators()); @@ -1389,7 +1354,7 @@ public Visitable visit(final JmlMultiCompareExpr n, final Object arg) { } @Override - public Visitable visit(final JmlSimpleExprClause n, final Object arg) { + public Visitable visit(final JmlSimpleExprClause n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); NodeList heaps = cloneList(n.getHeaps().orElse(null), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1402,7 +1367,7 @@ public Visitable visit(final JmlSimpleExprClause n, final Object arg) { } @Override - public Visitable visit(final JmlSignalsClause n, final Object arg) { + public Visitable visit(final JmlSignalsClause n, final Object arg) { Expression expression = cloneNode(n.getExpression(), arg); Parameter parameter = cloneNode(n.getParameter(), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1415,7 +1380,7 @@ public Visitable visit(final JmlSignalsClause n, final Object arg) { } @Override - public Visitable visit(final JmlSignalsOnlyClause n, final Object arg) { + public Visitable visit(final JmlSignalsOnlyClause n, final Object arg) { NodeList types = cloneList(n.getTypes(), arg); SimpleName name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1427,7 +1392,7 @@ public Visitable visit(final JmlSignalsOnlyClause n, final Object arg) { } @Override - public Visitable visit(final JmlUnreachableStmt n, final Object arg) { + public Visitable visit(final JmlUnreachableStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlUnreachableStmt r = new JmlUnreachableStmt(n.getTokenRange().orElse(null), jmlTags); @@ -1438,7 +1403,7 @@ public Visitable visit(final JmlUnreachableStmt n, final Object arg) { } @Override - public Visitable visit(final JmlCallableClause n, final Object arg) { + public Visitable visit(final JmlCallableClause n, final Object arg) { NodeList methodSignatures = cloneList(n.getMethodSignatures(), arg); SimpleName name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1450,7 +1415,7 @@ public Visitable visit(final JmlCallableClause n, final Object arg) { } @Override - public Visitable visit(final JmlForallClause n, final Object arg) { + public Visitable visit(final JmlForallClause n, final Object arg) { NodeList boundedVariables = cloneList(n.getBoundedVariables(), arg); SimpleName name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1462,7 +1427,7 @@ public Visitable visit(final JmlForallClause n, final Object arg) { } @Override - public Visitable visit(final JmlRefiningStmt n, final Object arg) { + public Visitable visit(final JmlRefiningStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlRefiningStmt r = new JmlRefiningStmt(n.getTokenRange().orElse(null), jmlTags); @@ -1473,7 +1438,7 @@ public Visitable visit(final JmlRefiningStmt n, final Object arg) { } @Override - public Visitable visit(final JmlClauseIf n, final Object arg) { + public Visitable visit(final JmlClauseIf n, final Object arg) { Expression condition = cloneNode(n.getCondition(), arg); Expression then = cloneNode(n.getThen(), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1486,7 +1451,7 @@ public Visitable visit(final JmlClauseIf n, final Object arg) { } @Override - public Visitable visit(final JmlClassExprDeclaration n, final Object arg) { + public Visitable visit(final JmlClassExprDeclaration n, final Object arg) { Expression invariant = cloneNode(n.getInvariant(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); SimpleName kind = cloneNode(n.getKind(), arg); @@ -1502,7 +1467,7 @@ public Visitable visit(final JmlClassExprDeclaration n, final Object arg) { } @Override - public Visitable visit(final JmlClassAccessibleDeclaration n, final Object arg) { + public Visitable visit(final JmlClassAccessibleDeclaration n, final Object arg) { NodeList expressions = cloneList(n.getExpressions(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); Expression measuredBy = cloneNode(n.getMeasuredBy(), arg); @@ -1518,7 +1483,7 @@ public Visitable visit(final JmlClassAccessibleDeclaration n, final Object arg) } @Override - public Visitable visit(final JmlRepresentsDeclaration n, final Object arg) { + public Visitable visit(final JmlRepresentsDeclaration n, final Object arg) { Expression expr = cloneNode(n.getExpr(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); @@ -1533,7 +1498,7 @@ public Visitable visit(final JmlRepresentsDeclaration n, final Object arg) { } @Override - public Visitable visit(final JmlContract n, final Object arg) { + public Visitable visit(final JmlContract n, final Object arg) { NodeList clauses = cloneList(n.getClauses(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); @@ -1548,7 +1513,7 @@ public Visitable visit(final JmlContract n, final Object arg) { } @Override - public Visitable visit(final JmlSetComprehensionExpr n, final Object arg) { + public Visitable visit(final JmlSetComprehensionExpr n, final Object arg) { VariableDeclarator binding = cloneNode(n.getBinding(), arg); Expression predicate = cloneNode(n.getPredicate(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1560,7 +1525,7 @@ public Visitable visit(final JmlSetComprehensionExpr n, final Object arg) { } @Override - public Visitable visit(final JmlGhostStmt n, final Object arg) { + public Visitable visit(final JmlGhostStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); Statement statement = cloneNode(n.getStatement(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1572,7 +1537,7 @@ public Visitable visit(final JmlGhostStmt n, final Object arg) { } @Override - public Visitable visit(final RecordDeclaration n, final Object arg) { + public Visitable visit(final RecordDeclaration n, final Object arg) { NodeList implementedTypes = cloneList(n.getImplementedTypes(), arg); NodeList parameters = cloneList(n.getParameters(), arg); ReceiverParameter receiverParameter = cloneNode(n.getReceiverParameter(), arg); @@ -1582,16 +1547,7 @@ public Visitable visit(final RecordDeclaration n, final Object arg) { SimpleName name = cloneNode(n.getName(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - RecordDeclaration r = new RecordDeclaration( - n.getTokenRange().orElse(null), - modifiers, - annotations, - name, - parameters, - typeParameters, - implementedTypes, - members, - receiverParameter); + RecordDeclaration r = new RecordDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, parameters, typeParameters, implementedTypes, members, receiverParameter); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1599,7 +1555,7 @@ public Visitable visit(final RecordDeclaration n, final Object arg) { } @Override - public Visitable visit(final CompactConstructorDeclaration n, final Object arg) { + public Visitable visit(final CompactConstructorDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1607,8 +1563,7 @@ public Visitable visit(final CompactConstructorDeclaration n, final Object arg) NodeList typeParameters = cloneList(n.getTypeParameters(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - CompactConstructorDeclaration r = new CompactConstructorDeclaration( - n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, thrownExceptions, body); + CompactConstructorDeclaration r = new CompactConstructorDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, thrownExceptions, body); r.setComment(comment); n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment); copyData(n, r); @@ -1616,7 +1571,7 @@ public Visitable visit(final CompactConstructorDeclaration n, final Object arg) } @Override - public Visitable visit(final RecordPatternExpr n, final Object arg) { + public Visitable visit(final RecordPatternExpr n, final Object arg) { NodeList modifiers = cloneList(n.getModifiers(), arg); NodeList patternList = cloneList(n.getPatternList(), arg); Type type = cloneNode(n.getType(), arg); @@ -1629,7 +1584,7 @@ public Visitable visit(final RecordPatternExpr n, final Object arg) { } @Override - public Visitable visit(final JmlMethodDeclaration n, final Object arg) { + public Visitable visit(final JmlMethodDeclaration n, final Object arg) { JmlContract contract = cloneNode(n.getContract(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); MethodDeclaration methodDeclaration = cloneNode(n.getMethodDeclaration(), arg); @@ -1643,7 +1598,7 @@ public Visitable visit(final JmlMethodDeclaration n, final Object arg) { } @Override - public Visitable visit(final JmlBinaryInfixExpr n, final Object arg) { + public Visitable visit(final JmlBinaryInfixExpr n, final Object arg) { Expression left = cloneNode(n.getLeft(), arg); SimpleName operator = cloneNode(n.getOperator(), arg); Expression right = cloneNode(n.getRight(), arg); @@ -1656,7 +1611,7 @@ public Visitable visit(final JmlBinaryInfixExpr n, final Object arg) { } @Override - public Visitable visit(final JmlDocDeclaration n, final Object arg) { + public Visitable visit(final JmlDocDeclaration n, final Object arg) { NodeList jmlComments = cloneList(n.getJmlComments(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1668,7 +1623,7 @@ public Visitable visit(final JmlDocDeclaration n, final Object arg) { } @Override - public Visitable visit(final JmlDocStmt n, final Object arg) { + public Visitable visit(final JmlDocStmt n, final Object arg) { NodeList jmlComments = cloneList(n.getJmlComments(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlDocStmt r = new JmlDocStmt(n.getTokenRange().orElse(null), jmlComments); @@ -1679,7 +1634,7 @@ public Visitable visit(final JmlDocStmt n, final Object arg) { } @Override - public Visitable visit(final JmlDoc n, final Object arg) { + public Visitable visit(final JmlDoc n, final Object arg) { Comment comment = cloneNode(n.getComment(), arg); JmlDoc r = new JmlDoc(n.getTokenRange().orElse(null), n.getContent()); r.setComment(comment); @@ -1689,7 +1644,7 @@ public Visitable visit(final JmlDoc n, final Object arg) { } @Override - public Visitable visit(final JmlDocType n, final Object arg) { + public Visitable visit(final JmlDocType n, final Object arg) { NodeList jmlComments = cloneList(n.getJmlComments(), arg); NodeList> members = cloneList(n.getMembers(), arg); NodeList modifiers = cloneList(n.getModifiers(), arg); @@ -1704,7 +1659,7 @@ public Visitable visit(final JmlDocType n, final Object arg) { } @Override - public Visitable visit(final JmlFieldDeclaration n, final Object arg) { + public Visitable visit(final JmlFieldDeclaration n, final Object arg) { FieldDeclaration decl = cloneNode(n.getDecl(), arg); NodeList jmlTags = cloneList(n.getJmlTags(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); @@ -1717,7 +1672,7 @@ public Visitable visit(final JmlFieldDeclaration n, final Object arg) { } @Override - public Visitable visit(final JmlOldClause n, final Object arg) { + public Visitable visit(final JmlOldClause n, final Object arg) { VariableDeclarationExpr declarations = cloneNode(n.getDeclarations(), arg); SimpleName name = cloneNode(n.getName(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1729,7 +1684,7 @@ public Visitable visit(final JmlOldClause n, final Object arg) { } @Override - public Visitable visit(final JmlTypeExpr n, final Object arg) { + public Visitable visit(final JmlTypeExpr n, final Object arg) { Type type = cloneNode(n.getType(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlTypeExpr r = new JmlTypeExpr(n.getTokenRange().orElse(null), type); @@ -1740,7 +1695,7 @@ public Visitable visit(final JmlTypeExpr n, final Object arg) { } @Override - public Visitable visit(final JmlMultiExprClause n, final Object arg) { + public Visitable visit(final JmlMultiExprClause n, final Object arg) { NodeList expressions = cloneList(n.getExpressions(), arg); NodeList heaps = cloneList(n.getHeaps().orElse(null), arg); SimpleName name = cloneNode(n.getName(), arg); @@ -1753,7 +1708,7 @@ public Visitable visit(final JmlMultiExprClause n, final Object arg) { } @Override - public Visitable visit(final JmlBeginStmt n, final Object arg) { + public Visitable visit(final JmlBeginStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlBeginStmt r = new JmlBeginStmt(n.getTokenRange().orElse(null), jmlTags); @@ -1764,7 +1719,7 @@ public Visitable visit(final JmlBeginStmt n, final Object arg) { } @Override - public Visitable visit(final JmlEndStmt n, final Object arg) { + public Visitable visit(final JmlEndStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); Comment comment = cloneNode(n.getComment(), arg); JmlEndStmt r = new JmlEndStmt(n.getTokenRange().orElse(null), jmlTags); @@ -1775,7 +1730,7 @@ public Visitable visit(final JmlEndStmt n, final Object arg) { } @Override - public Visitable visit(final JmlLabelStmt n, final Object arg) { + public Visitable visit(final JmlLabelStmt n, final Object arg) { NodeList jmlTags = cloneList(n.getJmlTags(), arg); SimpleName label = cloneNode(n.getLabel(), arg); Comment comment = cloneNode(n.getComment(), arg); @@ -1787,7 +1742,7 @@ public Visitable visit(final JmlLabelStmt n, final Object arg) { } @Override - public Visitable visit(final JmlMethodSignature n, final Object arg) { + public Visitable visit(final JmlMethodSignature n, final Object arg) { NodeList argumentTypes = cloneList(n.getArgumentTypes(), arg); SimpleName name = cloneNode(n.getName(), arg); Type receiver = cloneNode(n.getReceiver(), arg); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java index d3b145c08f..54b63d5119 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java @@ -26,10 +26,14 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; - import java.util.List; import java.util.Optional; @@ -38,7 +42,7 @@ * * @author Julio Vilmar Gesser */ -public class EqualsVisitor implements GenericVisitor { +public class EqualsVisitor implements GenericVisitor { private static final EqualsVisitor SINGLETON = new EqualsVisitor(); @@ -132,939 +136,1266 @@ private boolean objEquals(final Object n, final Object n2) { } @Override - public Boolean visit(final CompilationUnit n, final Visitable arg) { + public Boolean visit(final CompilationUnit n, final Visitable arg) { final CompilationUnit n2 = (CompilationUnit) arg; - if (!nodesEquals(n.getImports(), n2.getImports())) return false; - if (!nodeEquals(n.getModule(), n2.getModule())) return false; - if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) return false; - if (!nodesEquals(n.getTypes(), n2.getTypes())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getImports(), n2.getImports())) + return false; + if (!nodeEquals(n.getModule(), n2.getModule())) + return false; + if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) + return false; + if (!nodesEquals(n.getTypes(), n2.getTypes())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final PackageDeclaration n, final Visitable arg) { + public Boolean visit(final PackageDeclaration n, final Visitable arg) { final PackageDeclaration n2 = (PackageDeclaration) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final TypeParameter n, final Visitable arg) { + public Boolean visit(final TypeParameter n, final Visitable arg) { final TypeParameter n2 = (TypeParameter) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LineComment n, final Visitable arg) { + public Boolean visit(final LineComment n, final Visitable arg) { final LineComment n2 = (LineComment) arg; - if (!objEquals(n.getContent(), n2.getContent())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getContent(), n2.getContent())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final BlockComment n, final Visitable arg) { + public Boolean visit(final BlockComment n, final Visitable arg) { final BlockComment n2 = (BlockComment) arg; - if (!objEquals(n.getContent(), n2.getContent())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getContent(), n2.getContent())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg; - if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) return false; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!objEquals(n.isInterface(), n2.isInterface())) return false; - if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) + return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!objEquals(n.isInterface(), n2.isInterface())) + return false; + if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final EnumDeclaration n, final Visitable arg) { + public Boolean visit(final EnumDeclaration n, final Visitable arg) { final EnumDeclaration n2 = (EnumDeclaration) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { + public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodesEquals(n.getClassBody(), n2.getClassBody())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodesEquals(n.getClassBody(), n2.getClassBody())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { final AnnotationDeclaration n2 = (AnnotationDeclaration) arg; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg; - if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final FieldDeclaration n, final Visitable arg) { + public Boolean visit(final FieldDeclaration n, final Visitable arg) { final FieldDeclaration n2 = (FieldDeclaration) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getVariables(), n2.getVariables())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getVariables(), n2.getVariables())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final VariableDeclarator n, final Visitable arg) { + public Boolean visit(final VariableDeclarator n, final Visitable arg) { final VariableDeclarator n2 = (VariableDeclarator) arg; - if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getInitializer(), n2.getInitializer())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { final ConstructorDeclaration n2 = (ConstructorDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final MethodDeclaration n, final Visitable arg) { + public Boolean visit(final MethodDeclaration n, final Visitable arg) { final MethodDeclaration n2 = (MethodDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final Parameter n, final Visitable arg) { + public Boolean visit(final Parameter n, final Visitable arg) { final Parameter n2 = (Parameter) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!objEquals(n.isVarArgs(), n2.isVarArgs())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!objEquals(n.isVarArgs(), n2.isVarArgs())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final InitializerDeclaration n, final Visitable arg) { + public Boolean visit(final InitializerDeclaration n, final Visitable arg) { final InitializerDeclaration n2 = (InitializerDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!objEquals(n.isStatic(), n2.isStatic())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!objEquals(n.isStatic(), n2.isStatic())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final JavadocComment n, final Visitable arg) { + public Boolean visit(final JavadocComment n, final Visitable arg) { final JavadocComment n2 = (JavadocComment) arg; - if (!objEquals(n.getContent(), n2.getContent())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getContent(), n2.getContent())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final PrimitiveType n, final Visitable arg) { + public Boolean visit(final PrimitiveType n, final Visitable arg) { final PrimitiveType n2 = (PrimitiveType) arg; - if (!objEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ArrayType n, final Visitable arg) { + public Boolean visit(final ArrayType n, final Visitable arg) { final ArrayType n2 = (ArrayType) arg; - if (!nodeEquals(n.getComponentType(), n2.getComponentType())) return false; - if (!objEquals(n.getOrigin(), n2.getOrigin())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComponentType(), n2.getComponentType())) + return false; + if (!objEquals(n.getOrigin(), n2.getOrigin())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { + public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { final ArrayCreationLevel n2 = (ArrayCreationLevel) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getDimension(), n2.getDimension())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getDimension(), n2.getDimension())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final IntersectionType n, final Visitable arg) { + public Boolean visit(final IntersectionType n, final Visitable arg) { final IntersectionType n2 = (IntersectionType) arg; - if (!nodesEquals(n.getElements(), n2.getElements())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getElements(), n2.getElements())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final UnionType n, final Visitable arg) { + public Boolean visit(final UnionType n, final Visitable arg) { final UnionType n2 = (UnionType) arg; - if (!nodesEquals(n.getElements(), n2.getElements())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getElements(), n2.getElements())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final VoidType n, final Visitable arg) { + public Boolean visit(final VoidType n, final Visitable arg) { final VoidType n2 = (VoidType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final WildcardType n, final Visitable arg) { + public Boolean visit(final WildcardType n, final Visitable arg) { final WildcardType n2 = (WildcardType) arg; - if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) return false; - if (!nodeEquals(n.getSuperType(), n2.getSuperType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) + return false; + if (!nodeEquals(n.getSuperType(), n2.getSuperType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final UnknownType n, final Visitable arg) { + public Boolean visit(final UnknownType n, final Visitable arg) { final UnknownType n2 = (UnknownType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { + public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { final ArrayAccessExpr n2 = (ArrayAccessExpr) arg; - if (!nodeEquals(n.getIndex(), n2.getIndex())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getIndex(), n2.getIndex())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { + public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { final ArrayCreationExpr n2 = (ArrayCreationExpr) arg; - if (!nodeEquals(n.getElementType(), n2.getElementType())) return false; - if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false; - if (!nodesEquals(n.getLevels(), n2.getLevels())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getElementType(), n2.getElementType())) + return false; + if (!nodeEquals(n.getInitializer(), n2.getInitializer())) + return false; + if (!nodesEquals(n.getLevels(), n2.getLevels())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { + public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg; - if (!nodesEquals(n.getValues(), n2.getValues())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getValues(), n2.getValues())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final AssignExpr n, final Visitable arg) { + public Boolean visit(final AssignExpr n, final Visitable arg) { final AssignExpr n2 = (AssignExpr) arg; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; - if (!nodeEquals(n.getTarget(), n2.getTarget())) return false; - if (!nodeEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; + if (!nodeEquals(n.getTarget(), n2.getTarget())) + return false; + if (!nodeEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final BinaryExpr n, final Visitable arg) { + public Boolean visit(final BinaryExpr n, final Visitable arg) { final BinaryExpr n2 = (BinaryExpr) arg; - if (!nodeEquals(n.getLeft(), n2.getLeft())) return false; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; - if (!nodeEquals(n.getRight(), n2.getRight())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getLeft(), n2.getLeft())) + return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; + if (!nodeEquals(n.getRight(), n2.getRight())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final CastExpr n, final Visitable arg) { + public Boolean visit(final CastExpr n, final Visitable arg) { final CastExpr n2 = (CastExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ClassExpr n, final Visitable arg) { + public Boolean visit(final ClassExpr n, final Visitable arg) { final ClassExpr n2 = (ClassExpr) arg; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ConditionalExpr n, final Visitable arg) { + public Boolean visit(final ConditionalExpr n, final Visitable arg) { final ConditionalExpr n2 = (ConditionalExpr) arg; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; - if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) return false; - if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; + if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) + return false; + if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final EnclosedExpr n, final Visitable arg) { + public Boolean visit(final EnclosedExpr n, final Visitable arg) { final EnclosedExpr n2 = (EnclosedExpr) arg; - if (!nodeEquals(n.getInner(), n2.getInner())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getInner(), n2.getInner())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final FieldAccessExpr n, final Visitable arg) { + public Boolean visit(final FieldAccessExpr n, final Visitable arg) { final FieldAccessExpr n2 = (FieldAccessExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final InstanceOfExpr n, final Visitable arg) { + public Boolean visit(final InstanceOfExpr n, final Visitable arg) { final InstanceOfExpr n2 = (InstanceOfExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getPattern(), n2.getPattern())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getPattern(), n2.getPattern())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final StringLiteralExpr n, final Visitable arg) { + public Boolean visit(final StringLiteralExpr n, final Visitable arg) { final StringLiteralExpr n2 = (StringLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { + public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LongLiteralExpr n, final Visitable arg) { + public Boolean visit(final LongLiteralExpr n, final Visitable arg) { final LongLiteralExpr n2 = (LongLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final CharLiteralExpr n, final Visitable arg) { + public Boolean visit(final CharLiteralExpr n, final Visitable arg) { final CharLiteralExpr n2 = (CharLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { + public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { + public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg; - if (!objEquals(n.isValue(), n2.isValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.isValue(), n2.isValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final NullLiteralExpr n, final Visitable arg) { + public Boolean visit(final NullLiteralExpr n, final Visitable arg) { final NullLiteralExpr n2 = (NullLiteralExpr) arg; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final MethodCallExpr n, final Visitable arg) { + public Boolean visit(final MethodCallExpr n, final Visitable arg) { final MethodCallExpr n2 = (MethodCallExpr) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final NameExpr n, final Visitable arg) { + public Boolean visit(final NameExpr n, final Visitable arg) { final NameExpr n2 = (NameExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { + public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { final ObjectCreationExpr n2 = (ObjectCreationExpr) arg; - if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) return false; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) + return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final Name n, final Visitable arg) { + public Boolean visit(final Name n, final Visitable arg) { final Name n2 = (Name) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; - if (!nodeEquals(n.getQualifier(), n2.getQualifier())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; + if (!nodeEquals(n.getQualifier(), n2.getQualifier())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SimpleName n, final Visitable arg) { + public Boolean visit(final SimpleName n, final Visitable arg) { final SimpleName n2 = (SimpleName) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ThisExpr n, final Visitable arg) { + public Boolean visit(final ThisExpr n, final Visitable arg) { final ThisExpr n2 = (ThisExpr) arg; - if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getTypeName(), n2.getTypeName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SuperExpr n, final Visitable arg) { + public Boolean visit(final SuperExpr n, final Visitable arg) { final SuperExpr n2 = (SuperExpr) arg; - if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getTypeName(), n2.getTypeName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final UnaryExpr n, final Visitable arg) { + public Boolean visit(final UnaryExpr n, final Visitable arg) { final UnaryExpr n2 = (UnaryExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { + public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getVariables(), n2.getVariables())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getVariables(), n2.getVariables())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { + public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { + public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg; - if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { + public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg; - if (!nodesEquals(n.getPairs(), n2.getPairs())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getPairs(), n2.getPairs())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final MemberValuePair n, final Visitable arg) { + public Boolean visit(final MemberValuePair n, final Visitable arg) { final MemberValuePair n2 = (MemberValuePair) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { + public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!objEquals(n.isThis(), n2.isThis())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!objEquals(n.isThis(), n2.isThis())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { final LocalClassDeclarationStmt n2 = (LocalClassDeclarationStmt) arg; - if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { final LocalRecordDeclarationStmt n2 = (LocalRecordDeclarationStmt) arg; - if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final AssertStmt n, final Visitable arg) { + public Boolean visit(final AssertStmt n, final Visitable arg) { final AssertStmt n2 = (AssertStmt) arg; - if (!nodeEquals(n.getCheck(), n2.getCheck())) return false; - if (!nodeEquals(n.getMessage(), n2.getMessage())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getCheck(), n2.getCheck())) + return false; + if (!nodeEquals(n.getMessage(), n2.getMessage())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final BlockStmt n, final Visitable arg) { + public Boolean visit(final BlockStmt n, final Visitable arg) { final BlockStmt n2 = (BlockStmt) arg; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getStatements(), n2.getStatements())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getStatements(), n2.getStatements())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LabeledStmt n, final Visitable arg) { + public Boolean visit(final LabeledStmt n, final Visitable arg) { final LabeledStmt n2 = (LabeledStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; - if (!nodeEquals(n.getStatement(), n2.getStatement())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; + if (!nodeEquals(n.getStatement(), n2.getStatement())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final EmptyStmt n, final Visitable arg) { + public Boolean visit(final EmptyStmt n, final Visitable arg) { final EmptyStmt n2 = (EmptyStmt) arg; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ExpressionStmt n, final Visitable arg) { + public Boolean visit(final ExpressionStmt n, final Visitable arg) { final ExpressionStmt n2 = (ExpressionStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SwitchStmt n, final Visitable arg) { + public Boolean visit(final SwitchStmt n, final Visitable arg) { final SwitchStmt n2 = (SwitchStmt) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodeEquals(n.getSelector(), n2.getSelector())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodeEquals(n.getSelector(), n2.getSelector())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SwitchEntry n, final Visitable arg) { + public Boolean visit(final SwitchEntry n, final Visitable arg) { final SwitchEntry n2 = (SwitchEntry) arg; - if (!nodeEquals(n.getGuard(), n2.getGuard())) return false; - if (!objEquals(n.isDefault(), n2.isDefault())) return false; - if (!nodesEquals(n.getLabels(), n2.getLabels())) return false; - if (!nodesEquals(n.getStatements(), n2.getStatements())) return false; - if (!objEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getGuard(), n2.getGuard())) + return false; + if (!objEquals(n.isDefault(), n2.isDefault())) + return false; + if (!nodesEquals(n.getLabels(), n2.getLabels())) + return false; + if (!nodesEquals(n.getStatements(), n2.getStatements())) + return false; + if (!objEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final BreakStmt n, final Visitable arg) { + public Boolean visit(final BreakStmt n, final Visitable arg) { final BreakStmt n2 = (BreakStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ReturnStmt n, final Visitable arg) { + public Boolean visit(final ReturnStmt n, final Visitable arg) { final ReturnStmt n2 = (ReturnStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final IfStmt n, final Visitable arg) { + public Boolean visit(final IfStmt n, final Visitable arg) { final IfStmt n2 = (IfStmt) arg; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; - if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) return false; - if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; + if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) + return false; + if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final WhileStmt n, final Visitable arg) { + public Boolean visit(final WhileStmt n, final Visitable arg) { final WhileStmt n2 = (WhileStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ContinueStmt n, final Visitable arg) { + public Boolean visit(final ContinueStmt n, final Visitable arg) { final ContinueStmt n2 = (ContinueStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final DoStmt n, final Visitable arg) { + public Boolean visit(final DoStmt n, final Visitable arg) { final DoStmt n2 = (DoStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ForEachStmt n, final Visitable arg) { + public Boolean visit(final ForEachStmt n, final Visitable arg) { final ForEachStmt n2 = (ForEachStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodeEquals(n.getIterable(), n2.getIterable())) return false; - if (!nodeEquals(n.getVariable(), n2.getVariable())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getIterable(), n2.getIterable())) + return false; + if (!nodeEquals(n.getVariable(), n2.getVariable())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ForStmt n, final Visitable arg) { + public Boolean visit(final ForStmt n, final Visitable arg) { final ForStmt n2 = (ForStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCompare(), n2.getCompare())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCompare(), n2.getCompare())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getInitialization(), n2.getInitialization())) return false; - if (!nodesEquals(n.getUpdate(), n2.getUpdate())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getInitialization(), n2.getInitialization())) + return false; + if (!nodesEquals(n.getUpdate(), n2.getUpdate())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ThrowStmt n, final Visitable arg) { + public Boolean visit(final ThrowStmt n, final Visitable arg) { final ThrowStmt n2 = (ThrowStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SynchronizedStmt n, final Visitable arg) { + public Boolean visit(final SynchronizedStmt n, final Visitable arg) { final SynchronizedStmt n2 = (SynchronizedStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final TryStmt n, final Visitable arg) { + public Boolean visit(final TryStmt n, final Visitable arg) { final TryStmt n2 = (TryStmt) arg; - if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) return false; - if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) return false; - if (!nodesEquals(n.getResources(), n2.getResources())) return false; - if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) + return false; + if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) + return false; + if (!nodesEquals(n.getResources(), n2.getResources())) + return false; + if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final CatchClause n, final Visitable arg) { + public Boolean visit(final CatchClause n, final Visitable arg) { final CatchClause n2 = (CatchClause) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getParameter(), n2.getParameter())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getParameter(), n2.getParameter())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final LambdaExpr n, final Visitable arg) { + public Boolean visit(final LambdaExpr n, final Visitable arg) { final LambdaExpr n2 = (LambdaExpr) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { + public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { final MethodReferenceExpr n2 = (MethodReferenceExpr) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final TypeExpr n, final Visitable arg) { + public Boolean visit(final TypeExpr n, final Visitable arg) { final TypeExpr n2 = (TypeExpr) arg; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ImportDeclaration n, final Visitable arg) { + public Boolean visit(final ImportDeclaration n, final Visitable arg) { final ImportDeclaration n2 = (ImportDeclaration) arg; - if (!objEquals(n.isAsterisk(), n2.isAsterisk())) return false; + if (!objEquals(n.isAsterisk(), n2.isAsterisk())) + return false; if (!objEquals(n.isJmlModel(), n2.isJmlModel())) return false; - if (!objEquals(n.isStatic(), n2.isStatic())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.isStatic(), n2.isStatic())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(NodeList n, Visitable arg) { + public Boolean visit(NodeList n, Visitable arg) { return nodesEquals((NodeList) n, (NodeList) arg); } @Override - public Boolean visit(final ModuleDeclaration n, final Visitable arg) { + public Boolean visit(final ModuleDeclaration n, final Visitable arg) { final ModuleDeclaration n2 = (ModuleDeclaration) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodesEquals(n.getDirectives(), n2.getDirectives())) return false; - if (!objEquals(n.isOpen(), n2.isOpen())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodesEquals(n.getDirectives(), n2.getDirectives())) + return false; + if (!objEquals(n.isOpen(), n2.isOpen())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { + public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { final ModuleRequiresDirective n2 = (ModuleRequiresDirective) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override() - public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { + public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { final ModuleExportsDirective n2 = (ModuleExportsDirective) arg; - if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override() - public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { + public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { final ModuleProvidesDirective n2 = (ModuleProvidesDirective) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getWith(), n2.getWith())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getWith(), n2.getWith())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override() - public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { + public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { final ModuleUsesDirective n2 = (ModuleUsesDirective) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { + public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { final ModuleOpensDirective n2 = (ModuleOpensDirective) arg; - if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final UnparsableStmt n, final Visitable arg) { + public Boolean visit(final UnparsableStmt n, final Visitable arg) { final UnparsableStmt n2 = (UnparsableStmt) arg; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final ReceiverParameter n, final Visitable arg) { + public Boolean visit(final ReceiverParameter n, final Visitable arg) { final ReceiverParameter n2 = (ReceiverParameter) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final VarType n, final Visitable arg) { + public Boolean visit(final VarType n, final Visitable arg) { final VarType n2 = (VarType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final Modifier n, final Visitable arg) { + public Boolean visit(final Modifier n, final Visitable arg) { final Modifier n2 = (Modifier) arg; - if (!objEquals(n.getKeyword(), n2.getKeyword())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getKeyword(), n2.getKeyword())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final SwitchExpr n, final Visitable arg) { + public Boolean visit(final SwitchExpr n, final Visitable arg) { final SwitchExpr n2 = (SwitchExpr) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodeEquals(n.getSelector(), n2.getSelector())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodeEquals(n.getSelector(), n2.getSelector())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final YieldStmt n, final Visitable arg) { + public Boolean visit(final YieldStmt n, final Visitable arg) { final YieldStmt n2 = (YieldStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { + public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { final TextBlockLiteralExpr n2 = (TextBlockLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final TypePatternExpr n, final Visitable arg) { + public Boolean visit(final TypePatternExpr n, final Visitable arg) { final TypePatternExpr n2 = (TypePatternExpr) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final JmlClauseLabel n, final Visitable arg) { + public Boolean visit(final JmlClauseLabel n, final Visitable arg) { final JmlClauseLabel n2 = (JmlClauseLabel) arg; if (!nodeEquals(n.getExpr(), n2.getExpr())) return false; @@ -1080,7 +1411,7 @@ public Boolean visit(final JmlClauseLabel n, final Visitable arg) { } @Override - public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { + public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { final JmlExpressionStmt n2 = (JmlExpressionStmt) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1094,7 +1425,7 @@ public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { + public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { final JmlQuantifiedExpr n2 = (JmlQuantifiedExpr) arg; if (!objEquals(n.getBinder(), n2.getBinder())) return false; @@ -1108,7 +1439,7 @@ public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlLabelExpr n, final Visitable arg) { + public Boolean visit(final JmlLabelExpr n, final Visitable arg) { final JmlLabelExpr n2 = (JmlLabelExpr) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1122,7 +1453,7 @@ public Boolean visit(final JmlLabelExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlLetExpr n, final Visitable arg) { + public Boolean visit(final JmlLetExpr n, final Visitable arg) { final JmlLetExpr n2 = (JmlLetExpr) arg; if (!nodeEquals(n.getBody(), n2.getBody())) return false; @@ -1134,7 +1465,7 @@ public Boolean visit(final JmlLetExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { + public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { final JmlMultiCompareExpr n2 = (JmlMultiCompareExpr) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -1146,7 +1477,7 @@ public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { + public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { final JmlSimpleExprClause n2 = (JmlSimpleExprClause) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1162,7 +1493,7 @@ public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlSignalsClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsClause n, final Visitable arg) { final JmlSignalsClause n2 = (JmlSignalsClause) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1176,7 +1507,7 @@ public Boolean visit(final JmlSignalsClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { final JmlSignalsOnlyClause n2 = (JmlSignalsOnlyClause) arg; if (!nodesEquals(n.getTypes(), n2.getTypes())) return false; @@ -1188,7 +1519,7 @@ public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { + public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { final JmlUnreachableStmt n2 = (JmlUnreachableStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1198,7 +1529,7 @@ public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlCallableClause n, final Visitable arg) { + public Boolean visit(final JmlCallableClause n, final Visitable arg) { final JmlCallableClause n2 = (JmlCallableClause) arg; if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures())) return false; @@ -1210,7 +1541,7 @@ public Boolean visit(final JmlCallableClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlForallClause n, final Visitable arg) { + public Boolean visit(final JmlForallClause n, final Visitable arg) { final JmlForallClause n2 = (JmlForallClause) arg; if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables())) return false; @@ -1222,7 +1553,7 @@ public Boolean visit(final JmlForallClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { + public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { final JmlRefiningStmt n2 = (JmlRefiningStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1232,7 +1563,7 @@ public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlClauseIf n, final Visitable arg) { + public Boolean visit(final JmlClauseIf n, final Visitable arg) { final JmlClauseIf n2 = (JmlClauseIf) arg; if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; @@ -1248,7 +1579,7 @@ public Boolean visit(final JmlClauseIf n, final Visitable arg) { } @Override - public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { final JmlClassExprDeclaration n2 = (JmlClassExprDeclaration) arg; if (!nodeEquals(n.getInvariant(), n2.getInvariant())) return false; @@ -1268,7 +1599,7 @@ public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { final JmlClassAccessibleDeclaration n2 = (JmlClassAccessibleDeclaration) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -1288,7 +1619,7 @@ public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) } @Override - public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { + public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { final JmlRepresentsDeclaration n2 = (JmlRepresentsDeclaration) arg; if (!nodeEquals(n.getExpr(), n2.getExpr())) return false; @@ -1306,7 +1637,7 @@ public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlContract n, final Visitable arg) { + public Boolean visit(final JmlContract n, final Visitable arg) { final JmlContract n2 = (JmlContract) arg; if (!objEquals(n.getBehavior(), n2.getBehavior())) return false; @@ -1328,7 +1659,7 @@ public Boolean visit(final JmlContract n, final Visitable arg) { } @Override - public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { + public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { final JmlSetComprehensionExpr n2 = (JmlSetComprehensionExpr) arg; if (!nodeEquals(n.getBinding(), n2.getBinding())) return false; @@ -1340,7 +1671,7 @@ public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlGhostStmt n, final Visitable arg) { + public Boolean visit(final JmlGhostStmt n, final Visitable arg) { final JmlGhostStmt n2 = (JmlGhostStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1352,45 +1683,65 @@ public Boolean visit(final JmlGhostStmt n, final Visitable arg) { } @Override - public Boolean visit(final RecordDeclaration n, final Visitable arg) { + public Boolean visit(final RecordDeclaration n, final Visitable arg) { final RecordDeclaration n2 = (RecordDeclaration) arg; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { final CompactConstructorDeclaration n2 = (CompactConstructorDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final RecordPatternExpr n, final Visitable arg) { + public Boolean visit(final RecordPatternExpr n, final Visitable arg) { final RecordPatternExpr n2 = (RecordPatternExpr) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getPatternList(), n2.getPatternList())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodeEquals(n.getComment(), n2.getComment())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getPatternList(), n2.getPatternList())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodeEquals(n.getComment(), n2.getComment())) + return false; return true; } @Override - public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { + public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { final JmlMethodDeclaration n2 = (JmlMethodDeclaration) arg; if (!nodeEquals(n.getContract(), n2.getContract())) return false; @@ -1406,7 +1757,7 @@ public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { + public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { final JmlBinaryInfixExpr n2 = (JmlBinaryInfixExpr) arg; if (!nodeEquals(n.getLeft(), n2.getLeft())) return false; @@ -1420,7 +1771,7 @@ public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { + public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { final JmlDocDeclaration n2 = (JmlDocDeclaration) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1432,7 +1783,7 @@ public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocStmt n, final Visitable arg) { + public Boolean visit(final JmlDocStmt n, final Visitable arg) { final JmlDocStmt n2 = (JmlDocStmt) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1442,7 +1793,7 @@ public Boolean visit(final JmlDocStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlDoc n, final Visitable arg) { + public Boolean visit(final JmlDoc n, final Visitable arg) { final JmlDoc n2 = (JmlDoc) arg; if (!objEquals(n.getContent(), n2.getContent())) return false; @@ -1452,7 +1803,7 @@ public Boolean visit(final JmlDoc n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocType n, final Visitable arg) { + public Boolean visit(final JmlDocType n, final Visitable arg) { final JmlDocType n2 = (JmlDocType) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1470,7 +1821,7 @@ public Boolean visit(final JmlDocType n, final Visitable arg) { } @Override - public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { + public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { final JmlFieldDeclaration n2 = (JmlFieldDeclaration) arg; if (!nodeEquals(n.getDecl(), n2.getDecl())) return false; @@ -1484,7 +1835,7 @@ public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlOldClause n, final Visitable arg) { + public Boolean visit(final JmlOldClause n, final Visitable arg) { final JmlOldClause n2 = (JmlOldClause) arg; if (!nodeEquals(n.getDeclarations(), n2.getDeclarations())) return false; @@ -1496,7 +1847,7 @@ public Boolean visit(final JmlOldClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlTypeExpr n, final Visitable arg) { + public Boolean visit(final JmlTypeExpr n, final Visitable arg) { final JmlTypeExpr n2 = (JmlTypeExpr) arg; if (!nodeEquals(n.getType(), n2.getType())) return false; @@ -1506,7 +1857,7 @@ public Boolean visit(final JmlTypeExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { + public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { final JmlMultiExprClause n2 = (JmlMultiExprClause) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -1522,7 +1873,7 @@ public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlBeginStmt n, final Visitable arg) { + public Boolean visit(final JmlBeginStmt n, final Visitable arg) { final JmlBeginStmt n2 = (JmlBeginStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1532,7 +1883,7 @@ public Boolean visit(final JmlBeginStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlEndStmt n, final Visitable arg) { + public Boolean visit(final JmlEndStmt n, final Visitable arg) { final JmlEndStmt n2 = (JmlEndStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1542,7 +1893,7 @@ public Boolean visit(final JmlEndStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlLabelStmt n, final Visitable arg) { + public Boolean visit(final JmlLabelStmt n, final Visitable arg) { final JmlLabelStmt n2 = (JmlLabelStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1554,7 +1905,7 @@ public Boolean visit(final JmlLabelStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlMethodSignature n, final Visitable arg) { + public Boolean visit(final JmlMethodSignature n, final Visitable arg) { final JmlMethodSignature n2 = (JmlMethodSignature) arg; if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes())) return false; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java index 1ab83086d3..c4543f13d4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java @@ -52,228 +52,264 @@ public abstract class GenericListVisitorAdapter implements GenericVisitor, A> { @Override - public List visit(final AnnotationDeclaration n, final A arg) { + public List visit(final AnnotationDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getMembers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final AnnotationMemberDeclaration n, final A arg) { + public List visit(final AnnotationMemberDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getDefaultValue().isPresent()) { tmp = n.getDefaultValue().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ArrayAccessExpr n, final A arg) { + public List visit(final ArrayAccessExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getIndex().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ArrayCreationExpr n, final A arg) { + public List visit(final ArrayCreationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getElementType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getInitializer().isPresent()) { tmp = n.getInitializer().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getLevels().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ArrayCreationLevel n, final A arg) { + public List visit(final ArrayCreationLevel n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getDimension().isPresent()) { tmp = n.getDimension().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ArrayInitializerExpr n, final A arg) { + public List visit(final ArrayInitializerExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getValues().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ArrayType n, final A arg) { + public List visit(final ArrayType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getComponentType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final AssertStmt n, final A arg) { + public List visit(final AssertStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getCheck().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getMessage().isPresent()) { tmp = n.getMessage().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final AssignExpr n, final A arg) { + public List visit(final AssignExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getTarget().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getValue().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final BinaryExpr n, final A arg) { + public List visit(final BinaryExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getLeft().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getRight().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final BlockComment n, final A arg) { + public List visit(final BlockComment n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final BlockStmt n, final A arg) { + public List visit(final BlockStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -283,232 +319,270 @@ public List visit(final BlockStmt n, final A arg) { } { tmp = n.getStatements().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final BooleanLiteralExpr n, final A arg) { + public List visit(final BooleanLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final BreakStmt n, final A arg) { + public List visit(final BreakStmt n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getLabel().isPresent()) { tmp = n.getLabel().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final CastExpr n, final A arg) { + public List visit(final CastExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final CatchClause n, final A arg) { + public List visit(final CatchClause n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getParameter().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final CharLiteralExpr n, final A arg) { + public List visit(final CharLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ClassExpr n, final A arg) { + public List visit(final ClassExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ClassOrInterfaceDeclaration n, final A arg) { + public List visit(final ClassOrInterfaceDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExtendedTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getImplementedTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getPermittedTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getMembers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ClassOrInterfaceType n, final A arg) { + public List visit(final ClassOrInterfaceType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getScope().isPresent()) { tmp = n.getScope().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final CompilationUnit n, final A arg) { + public List visit(final CompilationUnit n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getImports().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getModule().isPresent()) { tmp = n.getModule().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getPackageDeclaration().isPresent()) { tmp = n.getPackageDeclaration().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ConditionalExpr n, final A arg) { + public List visit(final ConditionalExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getCondition().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getElseExpr().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getThenExpr().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ConstructorDeclaration n, final A arg) { + public List visit(final ConstructorDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -517,65 +591,77 @@ public List visit(final ConstructorDeclaration n, final A arg) { } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getReceiverParameter().isPresent()) { tmp = n.getReceiverParameter().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getThrownExceptions().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ContinueStmt n, final A arg) { + public List visit(final ContinueStmt n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getLabel().isPresent()) { tmp = n.getLabel().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final DoStmt n, final A arg) { + public List visit(final DoStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getCondition().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -584,205 +670,238 @@ public List visit(final DoStmt n, final A arg) { } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final DoubleLiteralExpr n, final A arg) { + public List visit(final DoubleLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final EmptyStmt n, final A arg) { + public List visit(final EmptyStmt n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final EnclosedExpr n, final A arg) { + public List visit(final EnclosedExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getInner().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final EnumConstantDeclaration n, final A arg) { + public List visit(final EnumConstantDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getArguments().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getClassBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final EnumDeclaration n, final A arg) { + public List visit(final EnumDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getEntries().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getImplementedTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getMembers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public List visit(final ExplicitConstructorInvocationStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getArguments().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getExpression().isPresent()) { tmp = n.getExpression().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ExpressionStmt n, final A arg) { + public List visit(final ExpressionStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final FieldAccessExpr n, final A arg) { + public List visit(final FieldAccessExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getScope().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final FieldDeclaration n, final A arg) { + public List visit(final FieldDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getVariables().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ForStmt n, final A arg) { + public List visit(final ForStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getCompare().isPresent()) { tmp = n.getCompare().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -791,26 +910,30 @@ public List visit(final ForStmt n, final A arg) { } { tmp = n.getInitialization().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getUpdate().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ForEachStmt n, final A arg) { + public List visit(final ForEachStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -819,166 +942,191 @@ public List visit(final ForEachStmt n, final A arg) { } { tmp = n.getIterable().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getVariable().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final IfStmt n, final A arg) { + public List visit(final IfStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getCondition().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getElseStmt().isPresent()) { tmp = n.getElseStmt().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getThenStmt().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ImportDeclaration n, final A arg) { + public List visit(final ImportDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final InitializerDeclaration n, final A arg) { + public List visit(final InitializerDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final InstanceOfExpr n, final A arg) { + public List visit(final InstanceOfExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getPattern().isPresent()) { tmp = n.getPattern().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final IntegerLiteralExpr n, final A arg) { + public List visit(final IntegerLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final IntersectionType n, final A arg) { + public List visit(final IntersectionType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getElements().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final JavadocComment n, final A arg) { + public List visit(final JavadocComment n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LabeledStmt n, final A arg) { + public List visit(final LabeledStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getLabel().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getStatement().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LambdaExpr n, final A arg) { + public List visit(final LambdaExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -987,139 +1135,159 @@ public List visit(final LambdaExpr n, final A arg) { } { tmp = n.getParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LineComment n, final A arg) { + public List visit(final LineComment n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LocalClassDeclarationStmt n, final A arg) { + public List visit(final LocalClassDeclarationStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getClassDeclaration().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LocalRecordDeclarationStmt n, final A arg) { + public List visit(final LocalRecordDeclarationStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getRecordDeclaration().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final LongLiteralExpr n, final A arg) { + public List visit(final LongLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final MarkerAnnotationExpr n, final A arg) { + public List visit(final MarkerAnnotationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final MemberValuePair n, final A arg) { + public List visit(final MemberValuePair n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getValue().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final MethodCallExpr n, final A arg) { + public List visit(final MethodCallExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getArguments().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getScope().isPresent()) { tmp = n.getScope().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final MethodDeclaration n, final A arg) { + public List visit(final MethodDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getBody().isPresent()) { tmp = n.getBody().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -1128,562 +1296,651 @@ public List visit(final MethodDeclaration n, final A arg) { } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getReceiverParameter().isPresent()) { tmp = n.getReceiverParameter().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getThrownExceptions().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final MethodReferenceExpr n, final A arg) { + public List visit(final MethodReferenceExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getScope().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final NameExpr n, final A arg) { + public List visit(final NameExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final Name n, final A arg) { + public List visit(final Name n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getQualifier().isPresent()) { tmp = n.getQualifier().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final NormalAnnotationExpr n, final A arg) { + public List visit(final NormalAnnotationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getPairs().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final NullLiteralExpr n, final A arg) { + public List visit(final NullLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ObjectCreationExpr n, final A arg) { + public List visit(final ObjectCreationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getAnonymousClassBody().isPresent()) { tmp = n.getAnonymousClassBody().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getArguments().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getScope().isPresent()) { tmp = n.getScope().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getTypeArguments().isPresent()) { tmp = n.getTypeArguments().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final PackageDeclaration n, final A arg) { + public List visit(final PackageDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final Parameter n, final A arg) { + public List visit(final Parameter n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getVarArgsAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final PrimitiveType n, final A arg) { + public List visit(final PrimitiveType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ReturnStmt n, final A arg) { + public List visit(final ReturnStmt n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getExpression().isPresent()) { tmp = n.getExpression().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SimpleName n, final A arg) { + public List visit(final SimpleName n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SingleMemberAnnotationExpr n, final A arg) { + public List visit(final SingleMemberAnnotationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getMemberValue().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final StringLiteralExpr n, final A arg) { + public List visit(final StringLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SuperExpr n, final A arg) { + public List visit(final SuperExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getTypeName().isPresent()) { tmp = n.getTypeName().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SwitchEntry n, final A arg) { + public List visit(final SwitchEntry n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getGuard().isPresent()) { tmp = n.getGuard().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getLabels().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getStatements().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SwitchStmt n, final A arg) { + public List visit(final SwitchStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getEntries().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getSelector().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SynchronizedStmt n, final A arg) { + public List visit(final SynchronizedStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ThisExpr n, final A arg) { + public List visit(final ThisExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getTypeName().isPresent()) { tmp = n.getTypeName().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ThrowStmt n, final A arg) { + public List visit(final ThrowStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final TryStmt n, final A arg) { + public List visit(final TryStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getCatchClauses().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getFinallyBlock().isPresent()) { tmp = n.getFinallyBlock().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getResources().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTryBlock().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final TypeExpr n, final A arg) { + public List visit(final TypeExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final TypeParameter n, final A arg) { + public List visit(final TypeParameter n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeBound().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final UnaryExpr n, final A arg) { + public List visit(final UnaryExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final UnionType n, final A arg) { + public List visit(final UnionType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getElements().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final UnknownType n, final A arg) { + public List visit(final UnknownType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final VariableDeclarationExpr n, final A arg) { + public List visit(final VariableDeclarationExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getVariables().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final VariableDeclarator n, final A arg) { + public List visit(final VariableDeclarator n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getInitializer().isPresent()) { tmp = n.getInitializer().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final VoidType n, final A arg) { + public List visit(final VoidType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final WhileStmt n, final A arg) { + public List visit(final WhileStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getCondition().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getContracts().accept(this, arg); @@ -1692,287 +1949,324 @@ public List visit(final WhileStmt n, final A arg) { } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final WildcardType n, final A arg) { + public List visit(final WildcardType n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getExtendedType().isPresent()) { tmp = n.getExtendedType().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getSuperType().isPresent()) { tmp = n.getSuperType().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(NodeList n, A arg) { - return ((NodeList) n) - .stream() - .filter(Objects::nonNull) - .flatMap(v -> v.accept(this, arg).stream()) - .collect(Collectors.toList()); + public List visit(NodeList n, A arg) { + return ((NodeList) n).stream().filter(Objects::nonNull).flatMap(v -> v.accept(this, arg).stream()).collect(Collectors.toList()); } @Override - public List visit(final ModuleDeclaration n, final A arg) { + public List visit(final ModuleDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getDirectives().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ModuleExportsDirective n, final A arg) { + public List visit(final ModuleExportsDirective n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModuleNames().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ModuleOpensDirective n, final A arg) { + public List visit(final ModuleOpensDirective n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModuleNames().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ModuleProvidesDirective n, final A arg) { + public List visit(final ModuleProvidesDirective n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getWith().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ModuleRequiresDirective n, final A arg) { + public List visit(final ModuleRequiresDirective n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ModuleUsesDirective n, final A arg) { + public List visit(final ModuleUsesDirective n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final UnparsableStmt n, final A arg) { + public List visit(final UnparsableStmt n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final ReceiverParameter n, final A arg) { + public List visit(final ReceiverParameter n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final VarType n, final A arg) { + public List visit(final VarType n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final Modifier n, final A arg) { + public List visit(final Modifier n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final SwitchExpr n, final A arg) { + public List visit(final SwitchExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getEntries().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getSelector().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final YieldStmt n, final A arg) { + public List visit(final YieldStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getExpression().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final TextBlockLiteralExpr n, final A arg) { + public List visit(final TextBlockLiteralExpr n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final TypePatternExpr n, final A arg) { + public List visit(final TypePatternExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final JmlQuantifiedExpr n, final A arg) { + public List visit(final JmlQuantifiedExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -1994,7 +2288,7 @@ public List visit(final JmlQuantifiedExpr n, final A arg) { } @Override - public List visit(final JmlClauseLabel n, final A arg) { + public List visit(final JmlClauseLabel n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2021,7 +2315,7 @@ public List visit(final JmlClauseLabel n, final A arg) { } @Override - public List visit(final JmlExpressionStmt n, final A arg) { + public List visit(final JmlExpressionStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2043,7 +2337,7 @@ public List visit(final JmlExpressionStmt n, final A arg) { } @Override - public List visit(final JmlLabelExpr n, final A arg) { + public List visit(final JmlLabelExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2065,7 +2359,7 @@ public List visit(final JmlLabelExpr n, final A arg) { } @Override - public List visit(final JmlLetExpr n, final A arg) { + public List visit(final JmlLetExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2087,7 +2381,7 @@ public List visit(final JmlLetExpr n, final A arg) { } @Override - public List visit(final JmlMultiCompareExpr n, final A arg) { + public List visit(final JmlMultiCompareExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2104,7 +2398,7 @@ public List visit(final JmlMultiCompareExpr n, final A arg) { } @Override - public List visit(final JmlSimpleExprClause n, final A arg) { + public List visit(final JmlSimpleExprClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2131,7 +2425,7 @@ public List visit(final JmlSimpleExprClause n, final A arg) { } @Override - public List visit(final JmlSignalsClause n, final A arg) { + public List visit(final JmlSignalsClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2158,7 +2452,7 @@ public List visit(final JmlSignalsClause n, final A arg) { } @Override - public List visit(final JmlSignalsOnlyClause n, final A arg) { + public List visit(final JmlSignalsOnlyClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2180,7 +2474,7 @@ public List visit(final JmlSignalsOnlyClause n, final A arg) { } @Override - public List visit(final JmlUnreachableStmt n, final A arg) { + public List visit(final JmlUnreachableStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2197,7 +2491,7 @@ public List visit(final JmlUnreachableStmt n, final A arg) { } @Override - public List visit(final JmlCallableClause n, final A arg) { + public List visit(final JmlCallableClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2219,7 +2513,7 @@ public List visit(final JmlCallableClause n, final A arg) { } @Override - public List visit(final JmlForallClause n, final A arg) { + public List visit(final JmlForallClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2241,7 +2535,7 @@ public List visit(final JmlForallClause n, final A arg) { } @Override - public List visit(final JmlRefiningStmt n, final A arg) { + public List visit(final JmlRefiningStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2258,7 +2552,7 @@ public List visit(final JmlRefiningStmt n, final A arg) { } @Override - public List visit(final JmlClauseIf n, final A arg) { + public List visit(final JmlClauseIf n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2285,7 +2579,7 @@ public List visit(final JmlClauseIf n, final A arg) { } @Override - public List visit(final JmlClassExprDeclaration n, final A arg) { + public List visit(final JmlClassExprDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2327,7 +2621,7 @@ public List visit(final JmlClassExprDeclaration n, final A arg) { } @Override - public List visit(final JmlClassAccessibleDeclaration n, final A arg) { + public List visit(final JmlClassAccessibleDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2369,7 +2663,7 @@ public List visit(final JmlClassAccessibleDeclaration n, final A arg) { } @Override - public List visit(final JmlRepresentsDeclaration n, final A arg) { + public List visit(final JmlRepresentsDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2406,7 +2700,7 @@ public List visit(final JmlRepresentsDeclaration n, final A arg) { } @Override - public List visit(final JmlContract n, final A arg) { + public List visit(final JmlContract n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2443,7 +2737,7 @@ public List visit(final JmlContract n, final A arg) { } @Override - public List visit(final JmlSetComprehensionExpr n, final A arg) { + public List visit(final JmlSetComprehensionExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2465,7 +2759,7 @@ public List visit(final JmlSetComprehensionExpr n, final A arg) { } @Override - public List visit(final JmlGhostStmt n, final A arg) { + public List visit(final JmlGhostStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2487,108 +2781,128 @@ public List visit(final JmlGhostStmt n, final A arg) { } @Override - public List visit(final RecordDeclaration n, final A arg) { + public List visit(final RecordDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getImplementedTypes().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getReceiverParameter().isPresent()) { tmp = n.getReceiverParameter().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getMembers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final CompactConstructorDeclaration n, final A arg) { + public List visit(final CompactConstructorDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getBody().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getName().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getThrownExceptions().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getTypeParameters().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getAnnotations().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final RecordPatternExpr n, final A arg) { + public List visit(final RecordPatternExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { tmp = n.getModifiers().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getPatternList().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } { tmp = n.getType().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } if (n.getComment().isPresent()) { tmp = n.getComment().get().accept(this, arg); - if (tmp != null) result.addAll(tmp); + if (tmp != null) + result.addAll(tmp); } return result; } @Override - public List visit(final JmlMethodDeclaration n, final A arg) { + public List visit(final JmlMethodDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getContract().isPresent()) { @@ -2620,7 +2934,7 @@ public List visit(final JmlMethodDeclaration n, final A arg) { } @Override - public List visit(final JmlBinaryInfixExpr n, final A arg) { + public List visit(final JmlBinaryInfixExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2647,7 +2961,7 @@ public List visit(final JmlBinaryInfixExpr n, final A arg) { } @Override - public List visit(final JmlDocDeclaration n, final A arg) { + public List visit(final JmlDocDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2669,7 +2983,7 @@ public List visit(final JmlDocDeclaration n, final A arg) { } @Override - public List visit(final JmlDocStmt n, final A arg) { + public List visit(final JmlDocStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2686,7 +3000,7 @@ public List visit(final JmlDocStmt n, final A arg) { } @Override - public List visit(final JmlDoc n, final A arg) { + public List visit(final JmlDoc n, final A arg) { List result = new ArrayList<>(); List tmp; if (n.getComment().isPresent()) { @@ -2698,7 +3012,7 @@ public List visit(final JmlDoc n, final A arg) { } @Override - public List visit(final JmlDocType n, final A arg) { + public List visit(final JmlDocType n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2735,7 +3049,7 @@ public List visit(final JmlDocType n, final A arg) { } @Override - public List visit(final JmlFieldDeclaration n, final A arg) { + public List visit(final JmlFieldDeclaration n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2762,7 +3076,7 @@ public List visit(final JmlFieldDeclaration n, final A arg) { } @Override - public List visit(final JmlOldClause n, final A arg) { + public List visit(final JmlOldClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2784,7 +3098,7 @@ public List visit(final JmlOldClause n, final A arg) { } @Override - public List visit(final JmlTypeExpr n, final A arg) { + public List visit(final JmlTypeExpr n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2801,7 +3115,7 @@ public List visit(final JmlTypeExpr n, final A arg) { } @Override - public List visit(final JmlMultiExprClause n, final A arg) { + public List visit(final JmlMultiExprClause n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2828,7 +3142,7 @@ public List visit(final JmlMultiExprClause n, final A arg) { } @Override - public List visit(final JmlBeginStmt n, final A arg) { + public List visit(final JmlBeginStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2845,7 +3159,7 @@ public List visit(final JmlBeginStmt n, final A arg) { } @Override - public List visit(final JmlEndStmt n, final A arg) { + public List visit(final JmlEndStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2862,7 +3176,7 @@ public List visit(final JmlEndStmt n, final A arg) { } @Override - public List visit(final JmlLabelStmt n, final A arg) { + public List visit(final JmlLabelStmt n, final A arg) { List result = new ArrayList<>(); List tmp; { @@ -2884,7 +3198,7 @@ public List visit(final JmlLabelStmt n, final A arg) { } @Override - public List visit(final JmlMethodSignature n, final A arg) { + public List visit(final JmlMethodSignature n, final A arg) { List result = new ArrayList<>(); List tmp; { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java index f544695cc9..7dff5112ab 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java @@ -26,6 +26,14 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.doc.JmlDoc; +import com.github.javaparser.ast.jml.doc.JmlDocDeclaration; +import com.github.javaparser.ast.jml.doc.JmlDocStmt; +import com.github.javaparser.ast.jml.doc.JmlDocType; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.body.*; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; @@ -35,7 +43,7 @@ * * @author Julio Vilmar Gesser */ -public interface GenericVisitor { +public interface GenericVisitor { // - Compilation Unit ---------------------------------- R visit(CompilationUnit n, A arg); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java index 0a4f942fd2..3edbfcc858 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java @@ -48,171 +48,200 @@ public abstract class GenericVisitorAdapter implements GenericVisitor { @Override - public R visit(final AnnotationDeclaration n, final A arg) { + public R visit(final AnnotationDeclaration n, final A arg) { R result; { result = n.getMembers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final AnnotationMemberDeclaration n, final A arg) { + public R visit(final AnnotationMemberDeclaration n, final A arg) { R result; if (n.getDefaultValue().isPresent()) { result = n.getDefaultValue().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ArrayAccessExpr n, final A arg) { + public R visit(final ArrayAccessExpr n, final A arg) { R result; { result = n.getIndex().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ArrayCreationExpr n, final A arg) { + public R visit(final ArrayCreationExpr n, final A arg) { R result; { result = n.getElementType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getInitializer().isPresent()) { result = n.getInitializer().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getLevels().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ArrayInitializerExpr n, final A arg) { + public R visit(final ArrayInitializerExpr n, final A arg) { R result; { result = n.getValues().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final AssertStmt n, final A arg) { + public R visit(final AssertStmt n, final A arg) { R result; { result = n.getCheck().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getMessage().isPresent()) { result = n.getMessage().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final AssignExpr n, final A arg) { + public R visit(final AssignExpr n, final A arg) { R result; { result = n.getTarget().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getValue().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final BinaryExpr n, final A arg) { + public R visit(final BinaryExpr n, final A arg) { R result; { result = n.getLeft().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getRight().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final BlockStmt n, final A arg) { + public R visit(final BlockStmt n, final A arg) { R result; { result = n.getContracts().accept(this, arg); @@ -221,221 +250,259 @@ public R visit(final BlockStmt n, final A arg) { } { result = n.getStatements().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final BooleanLiteralExpr n, final A arg) { + public R visit(final BooleanLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final BreakStmt n, final A arg) { + public R visit(final BreakStmt n, final A arg) { R result; if (n.getLabel().isPresent()) { result = n.getLabel().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final CastExpr n, final A arg) { + public R visit(final CastExpr n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final CatchClause n, final A arg) { + public R visit(final CatchClause n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getParameter().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final CharLiteralExpr n, final A arg) { + public R visit(final CharLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ClassExpr n, final A arg) { + public R visit(final ClassExpr n, final A arg) { R result; { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ClassOrInterfaceDeclaration n, final A arg) { + public R visit(final ClassOrInterfaceDeclaration n, final A arg) { R result; { result = n.getExtendedTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getImplementedTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getPermittedTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getMembers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ClassOrInterfaceType n, final A arg) { + public R visit(final ClassOrInterfaceType n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getScope().isPresent()) { result = n.getScope().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final CompilationUnit n, final A arg) { + public R visit(final CompilationUnit n, final A arg) { R result; { result = n.getImports().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getModule().isPresent()) { result = n.getModule().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getPackageDeclaration().isPresent()) { result = n.getPackageDeclaration().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ConditionalExpr n, final A arg) { + public R visit(final ConditionalExpr n, final A arg) { R result; { result = n.getCondition().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getElseExpr().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getThenExpr().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ConstructorDeclaration n, final A arg) { + public R visit(final ConstructorDeclaration n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -444,63 +511,75 @@ public R visit(final ConstructorDeclaration n, final A arg) { } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getReceiverParameter().isPresent()) { result = n.getReceiverParameter().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getThrownExceptions().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ContinueStmt n, final A arg) { + public R visit(final ContinueStmt n, final A arg) { R result; if (n.getLabel().isPresent()) { result = n.getLabel().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final DoStmt n, final A arg) { + public R visit(final DoStmt n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getCondition().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -509,191 +588,223 @@ public R visit(final DoStmt n, final A arg) { } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final DoubleLiteralExpr n, final A arg) { + public R visit(final DoubleLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final EmptyStmt n, final A arg) { + public R visit(final EmptyStmt n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final EnclosedExpr n, final A arg) { + public R visit(final EnclosedExpr n, final A arg) { R result; { result = n.getInner().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final EnumConstantDeclaration n, final A arg) { + public R visit(final EnumConstantDeclaration n, final A arg) { R result; { result = n.getArguments().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getClassBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final EnumDeclaration n, final A arg) { + public R visit(final EnumDeclaration n, final A arg) { R result; { result = n.getEntries().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getImplementedTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getMembers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public R visit(final ExplicitConstructorInvocationStmt n, final A arg) { R result; { result = n.getArguments().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getExpression().isPresent()) { result = n.getExpression().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ExpressionStmt n, final A arg) { + public R visit(final ExpressionStmt n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final FieldAccessExpr n, final A arg) { + public R visit(final FieldAccessExpr n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getScope().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final FieldDeclaration n, final A arg) { + public R visit(final FieldDeclaration n, final A arg) { R result; { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getVariables().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ForEachStmt n, final A arg) { + public R visit(final ForEachStmt n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -702,29 +813,34 @@ public R visit(final ForEachStmt n, final A arg) { } { result = n.getIterable().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getVariable().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ForStmt n, final A arg) { + public R visit(final ForStmt n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getCompare().isPresent()) { result = n.getCompare().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -733,197 +849,229 @@ public R visit(final ForStmt n, final A arg) { } { result = n.getInitialization().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getUpdate().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final IfStmt n, final A arg) { + public R visit(final IfStmt n, final A arg) { R result; { result = n.getCondition().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getElseStmt().isPresent()) { result = n.getElseStmt().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getThenStmt().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final InitializerDeclaration n, final A arg) { + public R visit(final InitializerDeclaration n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final InstanceOfExpr n, final A arg) { + public R visit(final InstanceOfExpr n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getPattern().isPresent()) { result = n.getPattern().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final IntegerLiteralExpr n, final A arg) { + public R visit(final IntegerLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final JavadocComment n, final A arg) { + public R visit(final JavadocComment n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LabeledStmt n, final A arg) { + public R visit(final LabeledStmt n, final A arg) { R result; { result = n.getLabel().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getStatement().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LongLiteralExpr n, final A arg) { + public R visit(final LongLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final MarkerAnnotationExpr n, final A arg) { + public R visit(final MarkerAnnotationExpr n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final MemberValuePair n, final A arg) { + public R visit(final MemberValuePair n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getValue().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final MethodCallExpr n, final A arg) { + public R visit(final MethodCallExpr n, final A arg) { R result; { result = n.getArguments().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getScope().isPresent()) { result = n.getScope().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final MethodDeclaration n, final A arg) { + public R visit(final MethodDeclaration n, final A arg) { R result; if (n.getBody().isPresent()) { result = n.getBody().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -932,583 +1080,680 @@ public R visit(final MethodDeclaration n, final A arg) { } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getReceiverParameter().isPresent()) { result = n.getReceiverParameter().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getThrownExceptions().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final NameExpr n, final A arg) { + public R visit(final NameExpr n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final NormalAnnotationExpr n, final A arg) { + public R visit(final NormalAnnotationExpr n, final A arg) { R result; { result = n.getPairs().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final NullLiteralExpr n, final A arg) { + public R visit(final NullLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ObjectCreationExpr n, final A arg) { + public R visit(final ObjectCreationExpr n, final A arg) { R result; if (n.getAnonymousClassBody().isPresent()) { result = n.getAnonymousClassBody().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getArguments().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getScope().isPresent()) { result = n.getScope().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final PackageDeclaration n, final A arg) { + public R visit(final PackageDeclaration n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final Parameter n, final A arg) { + public R visit(final Parameter n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getVarArgsAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final PrimitiveType n, final A arg) { + public R visit(final PrimitiveType n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final Name n, final A arg) { + public R visit(final Name n, final A arg) { R result; if (n.getQualifier().isPresent()) { result = n.getQualifier().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SimpleName n, final A arg) { + public R visit(final SimpleName n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ArrayType n, final A arg) { + public R visit(final ArrayType n, final A arg) { R result; { result = n.getComponentType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ArrayCreationLevel n, final A arg) { + public R visit(final ArrayCreationLevel n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getDimension().isPresent()) { result = n.getDimension().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final IntersectionType n, final A arg) { + public R visit(final IntersectionType n, final A arg) { R result; { result = n.getElements().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final UnionType n, final A arg) { + public R visit(final UnionType n, final A arg) { R result; { result = n.getElements().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ReturnStmt n, final A arg) { + public R visit(final ReturnStmt n, final A arg) { R result; if (n.getExpression().isPresent()) { result = n.getExpression().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SingleMemberAnnotationExpr n, final A arg) { + public R visit(final SingleMemberAnnotationExpr n, final A arg) { R result; { result = n.getMemberValue().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final StringLiteralExpr n, final A arg) { + public R visit(final StringLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SuperExpr n, final A arg) { + public R visit(final SuperExpr n, final A arg) { R result; if (n.getTypeName().isPresent()) { result = n.getTypeName().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SwitchEntry n, final A arg) { + public R visit(final SwitchEntry n, final A arg) { R result; if (n.getGuard().isPresent()) { result = n.getGuard().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getLabels().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getStatements().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SwitchStmt n, final A arg) { + public R visit(final SwitchStmt n, final A arg) { R result; { result = n.getEntries().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getSelector().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SynchronizedStmt n, final A arg) { + public R visit(final SynchronizedStmt n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ThisExpr n, final A arg) { + public R visit(final ThisExpr n, final A arg) { R result; if (n.getTypeName().isPresent()) { result = n.getTypeName().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ThrowStmt n, final A arg) { + public R visit(final ThrowStmt n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final TryStmt n, final A arg) { + public R visit(final TryStmt n, final A arg) { R result; { result = n.getCatchClauses().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getFinallyBlock().isPresent()) { result = n.getFinallyBlock().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getResources().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTryBlock().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LocalClassDeclarationStmt n, final A arg) { + public R visit(final LocalClassDeclarationStmt n, final A arg) { R result; { result = n.getClassDeclaration().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LocalRecordDeclarationStmt n, final A arg) { + public R visit(final LocalRecordDeclarationStmt n, final A arg) { R result; { result = n.getRecordDeclaration().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final TypeParameter n, final A arg) { + public R visit(final TypeParameter n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeBound().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final UnaryExpr n, final A arg) { + public R visit(final UnaryExpr n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final UnknownType n, final A arg) { + public R visit(final UnknownType n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final VariableDeclarationExpr n, final A arg) { + public R visit(final VariableDeclarationExpr n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getVariables().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final VariableDeclarator n, final A arg) { + public R visit(final VariableDeclarator n, final A arg) { R result; if (n.getInitializer().isPresent()) { result = n.getInitializer().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final VoidType n, final A arg) { + public R visit(final VoidType n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final WhileStmt n, final A arg) { + public R visit(final WhileStmt n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getCondition().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -1517,39 +1762,45 @@ public R visit(final WhileStmt n, final A arg) { } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final WildcardType n, final A arg) { + public R visit(final WildcardType n, final A arg) { R result; if (n.getExtendedType().isPresent()) { result = n.getExtendedType().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getSuperType().isPresent()) { result = n.getSuperType().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LambdaExpr n, final A arg) { + public R visit(final LambdaExpr n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getContracts().accept(this, arg); @@ -1558,83 +1809,94 @@ public R visit(final LambdaExpr n, final A arg) { } { result = n.getParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final MethodReferenceExpr n, final A arg) { + public R visit(final MethodReferenceExpr n, final A arg) { R result; { result = n.getScope().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getTypeArguments().isPresent()) { result = n.getTypeArguments().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final TypeExpr n, final A arg) { + public R visit(final TypeExpr n, final A arg) { R result; { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ImportDeclaration n, final A arg) { + public R visit(final ImportDeclaration n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final BlockComment n, final A arg) { + public R visit(final BlockComment n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final LineComment n, final A arg) { + public R visit(final LineComment n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(NodeList n, A arg) { + public R visit(NodeList n, A arg) { for (final Object v : n) { R result = ((Node) v).accept(this, arg); if (result != null) { @@ -1645,235 +1907,271 @@ public R visit(NodeList n, A arg) { } @Override - public R visit(final ModuleDeclaration n, final A arg) { + public R visit(final ModuleDeclaration n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getDirectives().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ModuleRequiresDirective n, final A arg) { + public R visit(final ModuleRequiresDirective n, final A arg) { R result; { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override() - public R visit(final ModuleExportsDirective n, final A arg) { + public R visit(final ModuleExportsDirective n, final A arg) { R result; { result = n.getModuleNames().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override() - public R visit(final ModuleProvidesDirective n, final A arg) { + public R visit(final ModuleProvidesDirective n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getWith().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override() - public R visit(final ModuleUsesDirective n, final A arg) { + public R visit(final ModuleUsesDirective n, final A arg) { R result; { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ModuleOpensDirective n, final A arg) { + public R visit(final ModuleOpensDirective n, final A arg) { R result; { result = n.getModuleNames().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final UnparsableStmt n, final A arg) { + public R visit(final UnparsableStmt n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final ReceiverParameter n, final A arg) { + public R visit(final ReceiverParameter n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final VarType n, final A arg) { + public R visit(final VarType n, final A arg) { R result; { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final Modifier n, final A arg) { + public R visit(final Modifier n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final SwitchExpr n, final A arg) { + public R visit(final SwitchExpr n, final A arg) { R result; { result = n.getEntries().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getSelector().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final YieldStmt n, final A arg) { + public R visit(final YieldStmt n, final A arg) { R result; { result = n.getExpression().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final TextBlockLiteralExpr n, final A arg) { + public R visit(final TextBlockLiteralExpr n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final TypePatternExpr n, final A arg) { + public R visit(final TypePatternExpr n, final A arg) { R result; { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final JmlQuantifiedExpr n, final A arg) { + public R visit(final JmlQuantifiedExpr n, final A arg) { R result; { result = n.getExpressions().accept(this, arg); @@ -1894,7 +2192,7 @@ public R visit(final JmlQuantifiedExpr n, final A arg) { } @Override - public R visit(final JmlClauseLabel n, final A arg) { + public R visit(final JmlClauseLabel n, final A arg) { R result; { result = n.getExpr().accept(this, arg); @@ -1920,7 +2218,7 @@ public R visit(final JmlClauseLabel n, final A arg) { } @Override - public R visit(final JmlExpressionStmt n, final A arg) { + public R visit(final JmlExpressionStmt n, final A arg) { R result; { result = n.getExpression().accept(this, arg); @@ -1941,7 +2239,7 @@ public R visit(final JmlExpressionStmt n, final A arg) { } @Override - public R visit(final JmlLabelExpr n, final A arg) { + public R visit(final JmlLabelExpr n, final A arg) { R result; { result = n.getExpression().accept(this, arg); @@ -1962,7 +2260,7 @@ public R visit(final JmlLabelExpr n, final A arg) { } @Override - public R visit(final JmlLetExpr n, final A arg) { + public R visit(final JmlLetExpr n, final A arg) { R result; { result = n.getBody().accept(this, arg); @@ -1983,7 +2281,7 @@ public R visit(final JmlLetExpr n, final A arg) { } @Override - public R visit(final JmlMultiCompareExpr n, final A arg) { + public R visit(final JmlMultiCompareExpr n, final A arg) { R result; { result = n.getExpressions().accept(this, arg); @@ -1999,7 +2297,7 @@ public R visit(final JmlMultiCompareExpr n, final A arg) { } @Override - public R visit(final JmlSimpleExprClause n, final A arg) { + public R visit(final JmlSimpleExprClause n, final A arg) { R result; { result = n.getExpression().accept(this, arg); @@ -2025,7 +2323,7 @@ public R visit(final JmlSimpleExprClause n, final A arg) { } @Override - public R visit(final JmlSignalsClause n, final A arg) { + public R visit(final JmlSignalsClause n, final A arg) { R result; { result = n.getExpression().accept(this, arg); @@ -2051,7 +2349,7 @@ public R visit(final JmlSignalsClause n, final A arg) { } @Override - public R visit(final JmlSignalsOnlyClause n, final A arg) { + public R visit(final JmlSignalsOnlyClause n, final A arg) { R result; { result = n.getTypes().accept(this, arg); @@ -2072,7 +2370,7 @@ public R visit(final JmlSignalsOnlyClause n, final A arg) { } @Override - public R visit(final JmlUnreachableStmt n, final A arg) { + public R visit(final JmlUnreachableStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2088,7 +2386,7 @@ public R visit(final JmlUnreachableStmt n, final A arg) { } @Override - public R visit(final JmlCallableClause n, final A arg) { + public R visit(final JmlCallableClause n, final A arg) { R result; { result = n.getMethodSignatures().accept(this, arg); @@ -2109,7 +2407,7 @@ public R visit(final JmlCallableClause n, final A arg) { } @Override - public R visit(final JmlForallClause n, final A arg) { + public R visit(final JmlForallClause n, final A arg) { R result; { result = n.getBoundedVariables().accept(this, arg); @@ -2130,7 +2428,7 @@ public R visit(final JmlForallClause n, final A arg) { } @Override - public R visit(final JmlRefiningStmt n, final A arg) { + public R visit(final JmlRefiningStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2146,7 +2444,7 @@ public R visit(final JmlRefiningStmt n, final A arg) { } @Override - public R visit(final JmlClauseIf n, final A arg) { + public R visit(final JmlClauseIf n, final A arg) { R result; { result = n.getCondition().accept(this, arg); @@ -2172,7 +2470,7 @@ public R visit(final JmlClauseIf n, final A arg) { } @Override - public R visit(final JmlClassExprDeclaration n, final A arg) { + public R visit(final JmlClassExprDeclaration n, final A arg) { R result; { result = n.getInvariant().accept(this, arg); @@ -2213,7 +2511,7 @@ public R visit(final JmlClassExprDeclaration n, final A arg) { } @Override - public R visit(final JmlClassAccessibleDeclaration n, final A arg) { + public R visit(final JmlClassAccessibleDeclaration n, final A arg) { R result; { result = n.getExpressions().accept(this, arg); @@ -2254,7 +2552,7 @@ public R visit(final JmlClassAccessibleDeclaration n, final A arg) { } @Override - public R visit(final JmlRepresentsDeclaration n, final A arg) { + public R visit(final JmlRepresentsDeclaration n, final A arg) { R result; { result = n.getExpr().accept(this, arg); @@ -2290,7 +2588,7 @@ public R visit(final JmlRepresentsDeclaration n, final A arg) { } @Override - public R visit(final JmlContract n, final A arg) { + public R visit(final JmlContract n, final A arg) { R result; { result = n.getClauses().accept(this, arg); @@ -2326,7 +2624,7 @@ public R visit(final JmlContract n, final A arg) { } @Override - public R visit(final JmlSetComprehensionExpr n, final A arg) { + public R visit(final JmlSetComprehensionExpr n, final A arg) { R result; { result = n.getBinding().accept(this, arg); @@ -2347,7 +2645,7 @@ public R visit(final JmlSetComprehensionExpr n, final A arg) { } @Override - public R visit(final JmlGhostStmt n, final A arg) { + public R visit(final JmlGhostStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2368,105 +2666,125 @@ public R visit(final JmlGhostStmt n, final A arg) { } @Override - public R visit(final RecordDeclaration n, final A arg) { + public R visit(final RecordDeclaration n, final A arg) { R result; { result = n.getImplementedTypes().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getReceiverParameter().isPresent()) { result = n.getReceiverParameter().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getMembers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final CompactConstructorDeclaration n, final A arg) { + public R visit(final CompactConstructorDeclaration n, final A arg) { R result; { result = n.getBody().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getName().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getThrownExceptions().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getTypeParameters().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getAnnotations().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final RecordPatternExpr n, final A arg) { + public R visit(final RecordPatternExpr n, final A arg) { R result; { result = n.getModifiers().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getPatternList().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } { result = n.getType().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); - if (result != null) return result; + if (result != null) + return result; } return null; } @Override - public R visit(final JmlMethodDeclaration n, final A arg) { + public R visit(final JmlMethodDeclaration n, final A arg) { R result; if (n.getContract().isPresent()) { result = n.getContract().get().accept(this, arg); @@ -2497,7 +2815,7 @@ public R visit(final JmlMethodDeclaration n, final A arg) { } @Override - public R visit(final JmlBinaryInfixExpr n, final A arg) { + public R visit(final JmlBinaryInfixExpr n, final A arg) { R result; { result = n.getLeft().accept(this, arg); @@ -2523,7 +2841,7 @@ public R visit(final JmlBinaryInfixExpr n, final A arg) { } @Override - public R visit(final JmlDocDeclaration n, final A arg) { + public R visit(final JmlDocDeclaration n, final A arg) { R result; { result = n.getJmlComments().accept(this, arg); @@ -2544,7 +2862,7 @@ public R visit(final JmlDocDeclaration n, final A arg) { } @Override - public R visit(final JmlDocStmt n, final A arg) { + public R visit(final JmlDocStmt n, final A arg) { R result; { result = n.getJmlComments().accept(this, arg); @@ -2560,7 +2878,7 @@ public R visit(final JmlDocStmt n, final A arg) { } @Override - public R visit(final JmlDoc n, final A arg) { + public R visit(final JmlDoc n, final A arg) { R result; if (n.getComment().isPresent()) { result = n.getComment().get().accept(this, arg); @@ -2571,7 +2889,7 @@ public R visit(final JmlDoc n, final A arg) { } @Override - public R visit(final JmlDocType n, final A arg) { + public R visit(final JmlDocType n, final A arg) { R result; { result = n.getJmlComments().accept(this, arg); @@ -2607,7 +2925,7 @@ public R visit(final JmlDocType n, final A arg) { } @Override - public R visit(final JmlFieldDeclaration n, final A arg) { + public R visit(final JmlFieldDeclaration n, final A arg) { R result; { result = n.getDecl().accept(this, arg); @@ -2633,7 +2951,7 @@ public R visit(final JmlFieldDeclaration n, final A arg) { } @Override - public R visit(final JmlOldClause n, final A arg) { + public R visit(final JmlOldClause n, final A arg) { R result; { result = n.getDeclarations().accept(this, arg); @@ -2654,7 +2972,7 @@ public R visit(final JmlOldClause n, final A arg) { } @Override - public R visit(final JmlTypeExpr n, final A arg) { + public R visit(final JmlTypeExpr n, final A arg) { R result; { result = n.getType().accept(this, arg); @@ -2670,7 +2988,7 @@ public R visit(final JmlTypeExpr n, final A arg) { } @Override - public R visit(final JmlMultiExprClause n, final A arg) { + public R visit(final JmlMultiExprClause n, final A arg) { R result; { result = n.getExpressions().accept(this, arg); @@ -2696,7 +3014,7 @@ public R visit(final JmlMultiExprClause n, final A arg) { } @Override - public R visit(final JmlBeginStmt n, final A arg) { + public R visit(final JmlBeginStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2712,7 +3030,7 @@ public R visit(final JmlBeginStmt n, final A arg) { } @Override - public R visit(final JmlEndStmt n, final A arg) { + public R visit(final JmlEndStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2728,7 +3046,7 @@ public R visit(final JmlEndStmt n, final A arg) { } @Override - public R visit(final JmlLabelStmt n, final A arg) { + public R visit(final JmlLabelStmt n, final A arg) { R result; { result = n.getJmlTags().accept(this, arg); @@ -2749,7 +3067,7 @@ public R visit(final JmlLabelStmt n, final A arg) { } @Override - public R visit(final JmlMethodSignature n, final A arg) { + public R visit(final JmlMethodSignature n, final A arg) { R result; { result = n.getArgumentTypes().accept(this, arg); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java index 1b55bf568d..2cd68b9ed4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java @@ -29,6 +29,11 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * A visitor that has a return value (R), and has default methods that are used when a specific visit method is not @@ -39,689 +44,689 @@ public abstract class GenericVisitorWithDefaults implements GenericVisitor /** * This will be called by every node visit method that is not overridden. */ - public R defaultAction(Node n, A arg) { + public R defaultAction(Node n, A arg) { return null; } /** * This will be called by the NodeList visit method when it is not overridden. */ - public R defaultAction(NodeList n, A arg) { + public R defaultAction(NodeList n, A arg) { return null; } @Override - public R visit(final AnnotationDeclaration n, final A arg) { + public R visit(final AnnotationDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final AnnotationMemberDeclaration n, final A arg) { + public R visit(final AnnotationMemberDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ArrayAccessExpr n, final A arg) { + public R visit(final ArrayAccessExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ArrayCreationExpr n, final A arg) { + public R visit(final ArrayCreationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ArrayInitializerExpr n, final A arg) { + public R visit(final ArrayInitializerExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final AssertStmt n, final A arg) { + public R visit(final AssertStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final AssignExpr n, final A arg) { + public R visit(final AssignExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final BinaryExpr n, final A arg) { + public R visit(final BinaryExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final BlockStmt n, final A arg) { + public R visit(final BlockStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final BooleanLiteralExpr n, final A arg) { + public R visit(final BooleanLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final BreakStmt n, final A arg) { + public R visit(final BreakStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final CastExpr n, final A arg) { + public R visit(final CastExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final CatchClause n, final A arg) { + public R visit(final CatchClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final CharLiteralExpr n, final A arg) { + public R visit(final CharLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ClassExpr n, final A arg) { + public R visit(final ClassExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ClassOrInterfaceDeclaration n, final A arg) { + public R visit(final ClassOrInterfaceDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ClassOrInterfaceType n, final A arg) { + public R visit(final ClassOrInterfaceType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final CompilationUnit n, final A arg) { + public R visit(final CompilationUnit n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ConditionalExpr n, final A arg) { + public R visit(final ConditionalExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ConstructorDeclaration n, final A arg) { + public R visit(final ConstructorDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ContinueStmt n, final A arg) { + public R visit(final ContinueStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final DoStmt n, final A arg) { + public R visit(final DoStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final DoubleLiteralExpr n, final A arg) { + public R visit(final DoubleLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final EmptyStmt n, final A arg) { + public R visit(final EmptyStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final EnclosedExpr n, final A arg) { + public R visit(final EnclosedExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final EnumConstantDeclaration n, final A arg) { + public R visit(final EnumConstantDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final EnumDeclaration n, final A arg) { + public R visit(final EnumDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public R visit(final ExplicitConstructorInvocationStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ExpressionStmt n, final A arg) { + public R visit(final ExpressionStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final FieldAccessExpr n, final A arg) { + public R visit(final FieldAccessExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final FieldDeclaration n, final A arg) { + public R visit(final FieldDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ForEachStmt n, final A arg) { + public R visit(final ForEachStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ForStmt n, final A arg) { + public R visit(final ForStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final IfStmt n, final A arg) { + public R visit(final IfStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final InitializerDeclaration n, final A arg) { + public R visit(final InitializerDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final InstanceOfExpr n, final A arg) { + public R visit(final InstanceOfExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final IntegerLiteralExpr n, final A arg) { + public R visit(final IntegerLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JavadocComment n, final A arg) { + public R visit(final JavadocComment n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LabeledStmt n, final A arg) { + public R visit(final LabeledStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LongLiteralExpr n, final A arg) { + public R visit(final LongLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final MarkerAnnotationExpr n, final A arg) { + public R visit(final MarkerAnnotationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final MemberValuePair n, final A arg) { + public R visit(final MemberValuePair n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final MethodCallExpr n, final A arg) { + public R visit(final MethodCallExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final MethodDeclaration n, final A arg) { + public R visit(final MethodDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final NameExpr n, final A arg) { + public R visit(final NameExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final NormalAnnotationExpr n, final A arg) { + public R visit(final NormalAnnotationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final NullLiteralExpr n, final A arg) { + public R visit(final NullLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ObjectCreationExpr n, final A arg) { + public R visit(final ObjectCreationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final PackageDeclaration n, final A arg) { + public R visit(final PackageDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final Parameter n, final A arg) { + public R visit(final Parameter n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final PrimitiveType n, final A arg) { + public R visit(final PrimitiveType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final Name n, final A arg) { + public R visit(final Name n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SimpleName n, final A arg) { + public R visit(final SimpleName n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ArrayType n, final A arg) { + public R visit(final ArrayType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ArrayCreationLevel n, final A arg) { + public R visit(final ArrayCreationLevel n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final IntersectionType n, final A arg) { + public R visit(final IntersectionType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final UnionType n, final A arg) { + public R visit(final UnionType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ReturnStmt n, final A arg) { + public R visit(final ReturnStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SingleMemberAnnotationExpr n, final A arg) { + public R visit(final SingleMemberAnnotationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final StringLiteralExpr n, final A arg) { + public R visit(final StringLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SuperExpr n, final A arg) { + public R visit(final SuperExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SwitchEntry n, final A arg) { + public R visit(final SwitchEntry n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SwitchStmt n, final A arg) { + public R visit(final SwitchStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SynchronizedStmt n, final A arg) { + public R visit(final SynchronizedStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ThisExpr n, final A arg) { + public R visit(final ThisExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ThrowStmt n, final A arg) { + public R visit(final ThrowStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final TryStmt n, final A arg) { + public R visit(final TryStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LocalClassDeclarationStmt n, final A arg) { + public R visit(final LocalClassDeclarationStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LocalRecordDeclarationStmt n, final A arg) { + public R visit(final LocalRecordDeclarationStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final TypeParameter n, final A arg) { + public R visit(final TypeParameter n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final UnaryExpr n, final A arg) { + public R visit(final UnaryExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final UnknownType n, final A arg) { + public R visit(final UnknownType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final VariableDeclarationExpr n, final A arg) { + public R visit(final VariableDeclarationExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final VariableDeclarator n, final A arg) { + public R visit(final VariableDeclarator n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final VoidType n, final A arg) { + public R visit(final VoidType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final WhileStmt n, final A arg) { + public R visit(final WhileStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final WildcardType n, final A arg) { + public R visit(final WildcardType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LambdaExpr n, final A arg) { + public R visit(final LambdaExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final MethodReferenceExpr n, final A arg) { + public R visit(final MethodReferenceExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final TypeExpr n, final A arg) { + public R visit(final TypeExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ImportDeclaration n, final A arg) { + public R visit(final ImportDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final BlockComment n, final A arg) { + public R visit(final BlockComment n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final LineComment n, final A arg) { + public R visit(final LineComment n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(NodeList n, A arg) { + public R visit(NodeList n, A arg) { return defaultAction(n, arg); } @Override - public R visit(final ModuleDeclaration n, final A arg) { + public R visit(final ModuleDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ModuleRequiresDirective n, final A arg) { + public R visit(final ModuleRequiresDirective n, final A arg) { return defaultAction(n, arg); } @Override() - public R visit(final ModuleExportsDirective n, final A arg) { + public R visit(final ModuleExportsDirective n, final A arg) { return defaultAction(n, arg); } @Override() - public R visit(final ModuleProvidesDirective n, final A arg) { + public R visit(final ModuleProvidesDirective n, final A arg) { return defaultAction(n, arg); } @Override() - public R visit(final ModuleUsesDirective n, final A arg) { + public R visit(final ModuleUsesDirective n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ModuleOpensDirective n, final A arg) { + public R visit(final ModuleOpensDirective n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final UnparsableStmt n, final A arg) { + public R visit(final UnparsableStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final ReceiverParameter n, final A arg) { + public R visit(final ReceiverParameter n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final VarType n, final A arg) { + public R visit(final VarType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final Modifier n, final A arg) { + public R visit(final Modifier n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final SwitchExpr n, final A arg) { + public R visit(final SwitchExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final YieldStmt n, final A arg) { + public R visit(final YieldStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final TextBlockLiteralExpr n, final A arg) { + public R visit(final TextBlockLiteralExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final TypePatternExpr n, final A arg) { + public R visit(final TypePatternExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlQuantifiedExpr n, final A arg) { + public R visit(final JmlQuantifiedExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlClauseLabel n, final A arg) { + public R visit(final JmlClauseLabel n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlExpressionStmt n, final A arg) { + public R visit(final JmlExpressionStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlLabelExpr n, final A arg) { + public R visit(final JmlLabelExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlLetExpr n, final A arg) { + public R visit(final JmlLetExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlMultiCompareExpr n, final A arg) { + public R visit(final JmlMultiCompareExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlSimpleExprClause n, final A arg) { + public R visit(final JmlSimpleExprClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlSignalsClause n, final A arg) { + public R visit(final JmlSignalsClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlSignalsOnlyClause n, final A arg) { + public R visit(final JmlSignalsOnlyClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlUnreachableStmt n, final A arg) { + public R visit(final JmlUnreachableStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlCallableClause n, final A arg) { + public R visit(final JmlCallableClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlForallClause n, final A arg) { + public R visit(final JmlForallClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlRefiningStmt n, final A arg) { + public R visit(final JmlRefiningStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlClauseIf n, final A arg) { + public R visit(final JmlClauseIf n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlClassExprDeclaration n, final A arg) { + public R visit(final JmlClassExprDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlClassAccessibleDeclaration n, final A arg) { + public R visit(final JmlClassAccessibleDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlRepresentsDeclaration n, final A arg) { + public R visit(final JmlRepresentsDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlContract n, final A arg) { + public R visit(final JmlContract n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlSetComprehensionExpr n, final A arg) { + public R visit(final JmlSetComprehensionExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlGhostStmt n, final A arg) { + public R visit(final JmlGhostStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final RecordDeclaration n, final A arg) { + public R visit(final RecordDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final CompactConstructorDeclaration n, final A arg) { + public R visit(final CompactConstructorDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final RecordPatternExpr n, final A arg) { + public R visit(final RecordPatternExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlMethodDeclaration n, final A arg) { + public R visit(final JmlMethodDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlBinaryInfixExpr n, final A arg) { + public R visit(final JmlBinaryInfixExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlDocDeclaration n, final A arg) { + public R visit(final JmlDocDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlDocStmt n, final A arg) { + public R visit(final JmlDocStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlDoc n, final A arg) { + public R visit(final JmlDoc n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlDocType n, final A arg) { + public R visit(final JmlDocType n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlFieldDeclaration n, final A arg) { + public R visit(final JmlFieldDeclaration n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlOldClause n, final A arg) { + public R visit(final JmlOldClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlTypeExpr n, final A arg) { + public R visit(final JmlTypeExpr n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlMultiExprClause n, final A arg) { + public R visit(final JmlMultiExprClause n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlBeginStmt n, final A arg) { + public R visit(final JmlBeginStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlEndStmt n, final A arg) { + public R visit(final JmlEndStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlLabelStmt n, final A arg) { + public R visit(final JmlLabelStmt n, final A arg) { return defaultAction(n, arg); } @Override - public R visit(final JmlMethodSignature n, final A arg) { + public R visit(final JmlMethodSignature n, final A arg) { return defaultAction(n, arg); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java index 90e61f47e9..b97e9ecba5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java @@ -29,12 +29,21 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * A visitor that calculates a deep hash code for a node by using the hash codes of all its properties, * and the hash codes of all its child nodes (by visiting those too.) */ -public class HashCodeVisitor implements GenericVisitor { +public class HashCodeVisitor implements GenericVisitor { private static final HashCodeVisitor SINGLETON = new HashCodeVisitor(); @@ -46,387 +55,231 @@ public static int hashCode(final Node node) { return node.accept(SINGLETON, null); } - public Integer visit(final AnnotationDeclaration n, final Void arg) { - return (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final AnnotationDeclaration n, final Void arg) { + return (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { - return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { + return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ArrayAccessExpr n, final Void arg) { - return (n.getIndex().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ArrayAccessExpr n, final Void arg) { + return (n.getIndex().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ArrayCreationExpr n, final Void arg) { - return (n.getElementType().accept(this, arg)) * 31 - + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 - + (n.getLevels().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ArrayCreationExpr n, final Void arg) { + return (n.getElementType().accept(this, arg)) * 31 + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getLevels().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ArrayCreationLevel n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ArrayCreationLevel n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ArrayInitializerExpr n, final Void arg) { - return (n.getValues().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ArrayInitializerExpr n, final Void arg) { + return (n.getValues().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ArrayType n, final Void arg) { - return (n.getComponentType().accept(this, arg)) * 31 - + (n.getOrigin().hashCode()) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ArrayType n, final Void arg) { + return (n.getComponentType().accept(this, arg)) * 31 + (n.getOrigin().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final AssertStmt n, final Void arg) { - return (n.getCheck().accept(this, arg)) * 31 - + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final AssertStmt n, final Void arg) { + return (n.getCheck().accept(this, arg)) * 31 + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final AssignExpr n, final Void arg) { - return (n.getOperator().hashCode()) * 31 - + (n.getTarget().accept(this, arg)) * 31 - + (n.getValue().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final AssignExpr n, final Void arg) { + return (n.getOperator().hashCode()) * 31 + (n.getTarget().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final BinaryExpr n, final Void arg) { - return (n.getLeft().accept(this, arg)) * 31 - + (n.getOperator().hashCode()) * 31 - + (n.getRight().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final BinaryExpr n, final Void arg) { + return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final BlockComment n, final Void arg) { - return (n.getContent().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final BlockComment n, final Void arg) { + return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final BlockStmt n, final Void arg) { - return (n.getStatements().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final BlockStmt n, final Void arg) { return (n.getContracts().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final BooleanLiteralExpr n, final Void arg) { - return (n.isValue() ? 1 : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final BooleanLiteralExpr n, final Void arg) { + return (n.isValue() ? 1 : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final BreakStmt n, final Void arg) { - return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final BreakStmt n, final Void arg) { + return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final CastExpr n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final CastExpr n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final CatchClause n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getParameter().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final CatchClause n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final CharLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final CharLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ClassExpr n, final Void arg) { - return (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ClassExpr n, final Void arg) { + return (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { - return (n.getExtendedTypes().accept(this, arg)) * 31 - + (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.isInterface() ? 1 : 0) * 31 - + (n.getPermittedTypes().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { + return (n.getExtendedTypes().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.isInterface() ? 1 : 0) * 31 + (n.getPermittedTypes().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ClassOrInterfaceType n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ClassOrInterfaceType n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final CompilationUnit n, final Void arg) { - return (n.getImports().accept(this, arg)) * 31 - + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 - + (n.getPackageDeclaration().isPresent() - ? n.getPackageDeclaration().get().accept(this, arg) - : 0) - * 31 - + (n.getTypes().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final CompilationUnit n, final Void arg) { + return (n.getImports().accept(this, arg)) * 31 + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 + (n.getPackageDeclaration().isPresent() ? n.getPackageDeclaration().get().accept(this, arg) : 0) * 31 + (n.getTypes().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ConditionalExpr n, final Void arg) { - return (n.getCondition().accept(this, arg)) * 31 - + (n.getElseExpr().accept(this, arg)) * 31 - + (n.getThenExpr().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ConditionalExpr n, final Void arg) { + return (n.getCondition().accept(this, arg)) * 31 + (n.getElseExpr().accept(this, arg)) * 31 + (n.getThenExpr().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ConstructorDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ContinueStmt n, final Void arg) { - return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ContinueStmt n, final Void arg) { + return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final DoStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getCondition().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final DoStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final DoubleLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final DoubleLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final EmptyStmt n, final Void arg) { + public Integer visit(final EmptyStmt n, final Void arg) { return (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final EnclosedExpr n, final Void arg) { - return (n.getInner().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final EnclosedExpr n, final Void arg) { + return (n.getInner().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final EnumConstantDeclaration n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getClassBody().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final EnumConstantDeclaration n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getClassBody().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final EnumDeclaration n, final Void arg) { - return (n.getEntries().accept(this, arg)) * 31 - + (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final EnumDeclaration n, final Void arg) { + return (n.getEntries().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 - + (n.isThis() ? 1 : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.isThis() ? 1 : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ExpressionStmt n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ExpressionStmt n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final FieldAccessExpr n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getScope().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final FieldAccessExpr n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final FieldDeclaration n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getVariables().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final FieldDeclaration n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ForStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 - + (n.getUpdate().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ForStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 + (n.getUpdate().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ForEachStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 - + (n.getVariable().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ForEachStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final IfStmt n, final Void arg) { - return (n.getCondition().accept(this, arg)) * 31 - + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 - + (n.getThenStmt().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final IfStmt n, final Void arg) { + return (n.getCondition().accept(this, arg)) * 31 + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 + (n.getThenStmt().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ImportDeclaration n, final Void arg) { - return (n.isAsterisk() ? 1 : 0) * 31 - + (n.isJmlModel() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ImportDeclaration n, final Void arg) { + return (n.isAsterisk() ? 1 : 0) * 31 + (n.isJmlModel() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final InitializerDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.isStatic() ? 1 : 0) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final InitializerDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final InstanceOfExpr n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final InstanceOfExpr n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final IntegerLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final IntegerLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final IntersectionType n, final Void arg) { - return (n.getElements().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final IntersectionType n, final Void arg) { + return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final JavadocComment n, final Void arg) { - return (n.getContent().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final JavadocComment n, final Void arg) { + return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LabeledStmt n, final Void arg) { - return (n.getLabel().accept(this, arg)) * 31 - + (n.getStatement().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LabeledStmt n, final Void arg) { + return (n.getLabel().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LambdaExpr n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LambdaExpr n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LineComment n, final Void arg) { - return (n.getContent().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LineComment n, final Void arg) { + return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { - return (n.getClassDeclaration().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { + return (n.getClassDeclaration().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { - return (n.getRecordDeclaration().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { + return (n.getRecordDeclaration().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final LongLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final LongLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final MarkerAnnotationExpr n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final MarkerAnnotationExpr n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final MemberValuePair n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getValue().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final MemberValuePair n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final MethodCallExpr n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final MethodCallExpr n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final MethodDeclaration n, final Void arg) { - return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final MethodDeclaration n, final Void arg) { + return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final MethodReferenceExpr n, final Void arg) { - return (n.getIdentifier().hashCode()) * 31 - + (n.getScope().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final MethodReferenceExpr n, final Void arg) { + return (n.getIdentifier().hashCode()) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final NameExpr n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final NameExpr n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final Name n, final Void arg) { - return (n.getIdentifier().hashCode()) * 31 - + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final Name n, final Void arg) { + return (n.getIdentifier().hashCode()) * 31 + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(NodeList n, Void arg) { + public Integer visit(NodeList n, Void arg) { int result = 0; for (Object node : n) { result += 31 * ((Visitable) node).accept(this, arg); @@ -434,470 +287,363 @@ public Integer visit(NodeList n, Void arg) { return result; } - public Integer visit(final NormalAnnotationExpr n, final Void arg) { - return (n.getPairs().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final NormalAnnotationExpr n, final Void arg) { + return (n.getPairs().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final NullLiteralExpr n, final Void arg) { + public Integer visit(final NullLiteralExpr n, final Void arg) { return (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ObjectCreationExpr n, final Void arg) { - return (n.getAnonymousClassBody().isPresent() - ? n.getAnonymousClassBody().get().accept(this, arg) - : 0) - * 31 - + (n.getArguments().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ObjectCreationExpr n, final Void arg) { + return (n.getAnonymousClassBody().isPresent() ? n.getAnonymousClassBody().get().accept(this, arg) : 0) * 31 + (n.getArguments().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final PackageDeclaration n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final PackageDeclaration n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final Parameter n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.isVarArgs() ? 1 : 0) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getVarArgsAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final Parameter n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.isVarArgs() ? 1 : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getVarArgsAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final PrimitiveType n, final Void arg) { - return (n.getType().hashCode()) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final PrimitiveType n, final Void arg) { + return (n.getType().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ReturnStmt n, final Void arg) { - return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ReturnStmt n, final Void arg) { + return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SimpleName n, final Void arg) { - return (n.getIdentifier().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SimpleName n, final Void arg) { + return (n.getIdentifier().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { - return (n.getMemberValue().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { + return (n.getMemberValue().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final StringLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final StringLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SuperExpr n, final Void arg) { - return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SuperExpr n, final Void arg) { + return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SwitchEntry n, final Void arg) { - return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 - + (n.isDefault() ? 1 : 0) * 31 - + (n.getLabels().accept(this, arg)) * 31 - + (n.getStatements().accept(this, arg)) * 31 - + (n.getType().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SwitchEntry n, final Void arg) { + return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 + (n.isDefault() ? 1 : 0) * 31 + (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SwitchStmt n, final Void arg) { - return (n.getEntries().accept(this, arg)) * 31 - + (n.getSelector().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SwitchStmt n, final Void arg) { + return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final SynchronizedStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getExpression().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SynchronizedStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ThisExpr n, final Void arg) { - return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ThisExpr n, final Void arg) { + return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ThrowStmt n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ThrowStmt n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final TryStmt n, final Void arg) { - return (n.getCatchClauses().accept(this, arg)) * 31 - + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 - + (n.getResources().accept(this, arg)) * 31 - + (n.getTryBlock().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final TryStmt n, final Void arg) { + return (n.getCatchClauses().accept(this, arg)) * 31 + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 + (n.getResources().accept(this, arg)) * 31 + (n.getTryBlock().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final TypeExpr n, final Void arg) { - return (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final TypeExpr n, final Void arg) { + return (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final TypeParameter n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getTypeBound().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final TypeParameter n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getTypeBound().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final UnaryExpr n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getOperator().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final UnaryExpr n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final UnionType n, final Void arg) { - return (n.getElements().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final UnionType n, final Void arg) { + return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final UnknownType n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final UnknownType n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final VariableDeclarationExpr n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getVariables().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final VariableDeclarationExpr n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final VariableDeclarator n, final Void arg) { - return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final VariableDeclarator n, final Void arg) { + return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final VoidType n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final VoidType n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final WhileStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getCondition().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final WhileStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final WildcardType n, final Void arg) { - return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 - + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final WildcardType n, final Void arg) { + return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ModuleDeclaration n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getDirectives().accept(this, arg)) * 31 - + (n.isOpen() ? 1 : 0) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleDeclaration n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDirectives().accept(this, arg)) * 31 + (n.isOpen() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final ModuleRequiresDirective n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleRequiresDirective n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override() - public Integer visit(final ModuleExportsDirective n, final Void arg) { - return (n.getModuleNames().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleExportsDirective n, final Void arg) { + return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override() - public Integer visit(final ModuleProvidesDirective n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getWith().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleProvidesDirective n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getWith().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override() - public Integer visit(final ModuleUsesDirective n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleUsesDirective n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final ModuleOpensDirective n, final Void arg) { - return (n.getModuleNames().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ModuleOpensDirective n, final Void arg) { + return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final UnparsableStmt n, final Void arg) { + public Integer visit(final UnparsableStmt n, final Void arg) { return (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final ReceiverParameter n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final ReceiverParameter n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final VarType n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final VarType n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final Modifier n, final Void arg) { - return (n.getKeyword().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final Modifier n, final Void arg) { + return (n.getKeyword().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final SwitchExpr n, final Void arg) { - return (n.getEntries().accept(this, arg)) * 31 - + (n.getSelector().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final SwitchExpr n, final Void arg) { + return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final YieldStmt n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final YieldStmt n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final TextBlockLiteralExpr n, final Void arg) { - return (n.getValue().hashCode()) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final TextBlockLiteralExpr n, final Void arg) { + return (n.getValue().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final TypePatternExpr n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final TypePatternExpr n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlQuantifiedExpr n, final Void arg) { + public Integer visit(final JmlQuantifiedExpr n, final Void arg) { return (n.getBinder().hashCode()) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlClauseLabel n, final Void arg) { + public Integer visit(final JmlClauseLabel n, final Void arg) { return (n.getExpr().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlExpressionStmt n, final Void arg) { + public Integer visit(final JmlExpressionStmt n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlLabelExpr n, final Void arg) { + public Integer visit(final JmlLabelExpr n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlLetExpr n, final Void arg) { + public Integer visit(final JmlLetExpr n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlMultiCompareExpr n, final Void arg) { + public Integer visit(final JmlMultiCompareExpr n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getOperators().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSimpleExprClause n, final Void arg) { + public Integer visit(final JmlSimpleExprClause n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSignalsClause n, final Void arg) { + public Integer visit(final JmlSignalsClause n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { + public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { return (n.getTypes().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlUnreachableStmt n, final Void arg) { + public Integer visit(final JmlUnreachableStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlCallableClause n, final Void arg) { + public Integer visit(final JmlCallableClause n, final Void arg) { return (n.getMethodSignatures().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlForallClause n, final Void arg) { + public Integer visit(final JmlForallClause n, final Void arg) { return (n.getBoundedVariables().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlRefiningStmt n, final Void arg) { + public Integer visit(final JmlRefiningStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlClauseIf n, final Void arg) { + public Integer visit(final JmlClauseIf n, final Void arg) { return (n.getCondition().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getThen().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlClassExprDeclaration n, final Void arg) { + public Integer visit(final JmlClassExprDeclaration n, final Void arg) { return (n.getInvariant().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { + public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { + public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { return (n.getExpr().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlContract n, final Void arg) { + public Integer visit(final JmlContract n, final Void arg) { return (n.getBehavior().hashCode()) * 31 + (n.getClauses().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSubContracts().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { + public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { return (n.getBinding().accept(this, arg)) * 31 + (n.getPredicate().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlGhostStmt n, final Void arg) { + public Integer visit(final JmlGhostStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final RecordDeclaration n, final Void arg) { - return (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final RecordDeclaration n, final Void arg) { + return (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } - public Integer visit(final CompactConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final CompactConstructorDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final RecordPatternExpr n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getPatternList().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + public Integer visit(final RecordPatternExpr n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getPatternList().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlMethodDeclaration n, final Void arg) { + public Integer visit(final JmlMethodDeclaration n, final Void arg) { return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMethodDeclaration().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { + public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().accept(this, arg)) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlDocDeclaration n, final Void arg) { + public Integer visit(final JmlDocDeclaration n, final Void arg) { return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlDocStmt n, final Void arg) { + public Integer visit(final JmlDocStmt n, final Void arg) { return (n.getJmlComments().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlDoc n, final Void arg) { + public Integer visit(final JmlDoc n, final Void arg) { return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlDocType n, final Void arg) { + public Integer visit(final JmlDocType n, final Void arg) { return (n.getJmlComments().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlFieldDeclaration n, final Void arg) { + public Integer visit(final JmlFieldDeclaration n, final Void arg) { return (n.getDecl().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlOldClause n, final Void arg) { + public Integer visit(final JmlOldClause n, final Void arg) { return (n.getDeclarations().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlTypeExpr n, final Void arg) { + public Integer visit(final JmlTypeExpr n, final Void arg) { return (n.getType().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlMultiExprClause n, final Void arg) { + public Integer visit(final JmlMultiExprClause n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlBeginStmt n, final Void arg) { + public Integer visit(final JmlBeginStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlEndStmt n, final Void arg) { + public Integer visit(final JmlEndStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlLabelStmt n, final Void arg) { + public Integer visit(final JmlLabelStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlMethodSignature n, final Void arg) { + public Integer visit(final JmlMethodSignature n, final Void arg) { return (n.getArgumentTypes().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } } 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 9b4041b485..eb5158f17d 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 @@ -31,13 +31,20 @@ import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; import com.github.javaparser.utils.Pair; - import java.util.ArrayList; import java.util.List; import java.util.Optional; - import static com.github.javaparser.utils.Utils.removeElementByObjectIdentity; import static com.github.javaparser.utils.Utils.replaceElementByObjectIdentity; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * This visitor can be used to save time when some specific nodes needs @@ -50,16 +57,17 @@ * * @author Julio Vilmar Gesser */ -public class ModifierVisitor implements GenericVisitor { +public class ModifierVisitor implements GenericVisitor { @Override - public Visitable visit(final AnnotationDeclaration n, final A arg) { + public Visitable visit(final AnnotationDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList> members = modifyList(n.getMembers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setMembers(members); @@ -69,15 +77,15 @@ public Visitable visit(final AnnotationDeclaration n, final A arg) { } @Override - public Visitable visit(final AnnotationMemberDeclaration n, final A arg) { + public Visitable visit(final AnnotationMemberDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); - Expression defaultValue = - n.getDefaultValue().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression defaultValue = n.getDefaultValue().map(s -> (Expression) s.accept(this, arg)).orElse(null); SimpleName name = (SimpleName) n.getName().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || type == null) return null; + if (name == null || type == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setDefaultValue(defaultValue); @@ -88,11 +96,12 @@ public Visitable visit(final AnnotationMemberDeclaration n, final A arg) { } @Override - public Visitable visit(final ArrayAccessExpr n, final A arg) { + public Visitable visit(final ArrayAccessExpr n, final A arg) { Expression index = (Expression) n.getIndex().accept(this, arg); Expression name = (Expression) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (index == null || name == null) return null; + if (index == null || name == null) + return null; n.setIndex(index); n.setName(name); n.setComment(comment); @@ -100,14 +109,13 @@ public Visitable visit(final ArrayAccessExpr n, final A arg) { } @Override - public Visitable visit(final ArrayCreationExpr n, final A arg) { + public Visitable visit(final ArrayCreationExpr n, final A arg) { Type elementType = (Type) n.getElementType().accept(this, arg); - ArrayInitializerExpr initializer = n.getInitializer() - .map(s -> (ArrayInitializerExpr) s.accept(this, arg)) - .orElse(null); + ArrayInitializerExpr initializer = n.getInitializer().map(s -> (ArrayInitializerExpr) s.accept(this, arg)).orElse(null); NodeList levels = modifyList(n.getLevels(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (elementType == null || levels.isEmpty()) return null; + if (elementType == null || levels.isEmpty()) + return null; n.setElementType(elementType); n.setInitializer(initializer); n.setLevels(levels); @@ -116,7 +124,7 @@ public Visitable visit(final ArrayCreationExpr n, final A arg) { } @Override - public Visitable visit(final ArrayInitializerExpr n, final A arg) { + public Visitable visit(final ArrayInitializerExpr n, final A arg) { NodeList values = modifyList(n.getValues(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setValues(values); @@ -125,12 +133,12 @@ public Visitable visit(final ArrayInitializerExpr n, final A arg) { } @Override - public Visitable visit(final AssertStmt n, final A arg) { + public Visitable visit(final AssertStmt n, final A arg) { Expression check = (Expression) n.getCheck().accept(this, arg); - Expression message = - n.getMessage().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression message = n.getMessage().map(s -> (Expression) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (check == null) return null; + if (check == null) + return null; n.setCheck(check); n.setMessage(message); n.setComment(comment); @@ -138,11 +146,12 @@ public Visitable visit(final AssertStmt n, final A arg) { } @Override - public Visitable visit(final AssignExpr n, final A arg) { + public Visitable visit(final AssignExpr n, final A arg) { Expression target = (Expression) n.getTarget().accept(this, arg); Expression value = (Expression) n.getValue().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (target == null || value == null) return null; + if (target == null || value == null) + return null; n.setTarget(target); n.setValue(value); n.setComment(comment); @@ -150,12 +159,14 @@ public Visitable visit(final AssignExpr n, final A arg) { } @Override - public Visitable visit(final BinaryExpr n, final A arg) { + public Visitable visit(final BinaryExpr n, final A arg) { Expression left = (Expression) n.getLeft().accept(this, arg); Expression right = (Expression) n.getRight().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (left == null) return right; - if (right == null) return left; + if (left == null) + return right; + if (right == null) + return left; n.setLeft(left); n.setRight(right); n.setComment(comment); @@ -163,7 +174,7 @@ public Visitable visit(final BinaryExpr n, final A arg) { } @Override - public Visitable visit(final BlockStmt n, final A arg) { + public Visitable visit(final BlockStmt n, final A arg) { NodeList contracts = modifyList(n.getContracts(), arg); NodeList statements = modifyList(n.getStatements(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -174,16 +185,15 @@ public Visitable visit(final BlockStmt n, final A arg) { } @Override - public Visitable visit(final BooleanLiteralExpr n, final A arg) { + public Visitable visit(final BooleanLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final BreakStmt n, final A arg) { - SimpleName label = - n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); + public Visitable visit(final BreakStmt n, final A arg) { + SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setLabel(label); n.setComment(comment); @@ -191,11 +201,12 @@ public Visitable visit(final BreakStmt n, final A arg) { } @Override - public Visitable visit(final CastExpr n, final A arg) { + public Visitable visit(final CastExpr n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null || type == null) return null; + if (expression == null || type == null) + return null; n.setExpression(expression); n.setType(type); n.setComment(comment); @@ -203,11 +214,12 @@ public Visitable visit(final CastExpr n, final A arg) { } @Override - public Visitable visit(final CatchClause n, final A arg) { + public Visitable visit(final CatchClause n, final A arg) { BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); Parameter parameter = (Parameter) n.getParameter().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || parameter == null) return null; + if (body == null || parameter == null) + return null; n.setBody(body); n.setParameter(parameter); n.setComment(comment); @@ -215,24 +227,25 @@ public Visitable visit(final CatchClause n, final A arg) { } @Override - public Visitable visit(final CharLiteralExpr n, final A arg) { + public Visitable visit(final CharLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final ClassExpr n, final A arg) { + public Visitable visit(final ClassExpr n, final A arg) { Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (type == null) return null; + if (type == null) + return null; n.setType(type); n.setComment(comment); return n; } @Override - public Visitable visit(final ClassOrInterfaceDeclaration n, final A arg) { + public Visitable visit(final ClassOrInterfaceDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList extendedTypes = modifyList(n.getExtendedTypes(), arg); @@ -242,7 +255,8 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final A arg) { NodeList> members = modifyList(n.getMembers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setExtendedTypes(extendedTypes); @@ -256,19 +270,18 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final A arg) { } @Override - public Visitable visit(final RecordDeclaration n, final A arg) { + public Visitable visit(final RecordDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList implementedTypes = modifyList(n.getImplementedTypes(), arg); NodeList parameters = modifyList(n.getParameters(), arg); - ReceiverParameter receiverParameter = n.getReceiverParameter() - .map(s -> (ReceiverParameter) s.accept(this, arg)) - .orElse(null); + ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); NodeList> members = modifyList(n.getMembers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setImplementedTypes(implementedTypes); @@ -282,15 +295,14 @@ public Visitable visit(final RecordDeclaration n, final A arg) { } @Override - public Visitable visit(final ClassOrInterfaceType n, final A arg) { + public Visitable visit(final ClassOrInterfaceType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); - ClassOrInterfaceType scope = n.getScope() - .map(s -> (ClassOrInterfaceType) s.accept(this, arg)) - .orElse(null); + ClassOrInterfaceType scope = n.getScope().map(s -> (ClassOrInterfaceType) s.accept(this, arg)).orElse(null); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setName(name); n.setScope(scope); @@ -300,13 +312,10 @@ public Visitable visit(final ClassOrInterfaceType n, final A arg) { } @Override - public Visitable visit(final CompilationUnit n, final A arg) { + public Visitable visit(final CompilationUnit n, final A arg) { NodeList imports = modifyList(n.getImports(), arg); - ModuleDeclaration module = - n.getModule().map(s -> (ModuleDeclaration) s.accept(this, arg)).orElse(null); - PackageDeclaration packageDeclaration = n.getPackageDeclaration() - .map(s -> (PackageDeclaration) s.accept(this, arg)) - .orElse(null); + ModuleDeclaration module = n.getModule().map(s -> (ModuleDeclaration) s.accept(this, arg)).orElse(null); + PackageDeclaration packageDeclaration = n.getPackageDeclaration().map(s -> (PackageDeclaration) s.accept(this, arg)).orElse(null); NodeList> types = modifyList(n.getTypes(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setImports(imports); @@ -318,12 +327,13 @@ public Visitable visit(final CompilationUnit n, final A arg) { } @Override - public Visitable visit(final ConditionalExpr n, final A arg) { + public Visitable visit(final ConditionalExpr n, final A arg) { Expression condition = (Expression) n.getCondition().accept(this, arg); Expression elseExpr = (Expression) n.getElseExpr().accept(this, arg); Expression thenExpr = (Expression) n.getThenExpr().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (condition == null || elseExpr == null || thenExpr == null) return null; + if (condition == null || elseExpr == null || thenExpr == null) + return null; n.setCondition(condition); n.setElseExpr(elseExpr); n.setThenExpr(thenExpr); @@ -332,20 +342,19 @@ public Visitable visit(final ConditionalExpr n, final A arg) { } @Override - public Visitable visit(final ConstructorDeclaration n, final A arg) { + public Visitable visit(final ConstructorDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); NodeList contracts = modifyList(n.getContracts(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); NodeList parameters = modifyList(n.getParameters(), arg); - ReceiverParameter receiverParameter = n.getReceiverParameter() - .map(s -> (ReceiverParameter) s.accept(this, arg)) - .orElse(null); + ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); NodeList thrownExceptions = modifyList(n.getThrownExceptions(), arg); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || name == null) return null; + if (body == null || name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setBody(body); @@ -360,7 +369,7 @@ public Visitable visit(final ConstructorDeclaration n, final A arg) { } @Override - public Visitable visit(final CompactConstructorDeclaration n, final A arg) { + public Visitable visit(final CompactConstructorDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); @@ -368,7 +377,8 @@ public Visitable visit(final CompactConstructorDeclaration n, final A arg) { NodeList thrownExceptions = modifyList(n.getThrownExceptions(), arg); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || name == null) return null; + if (body == null || name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setBody(body); @@ -380,9 +390,8 @@ public Visitable visit(final CompactConstructorDeclaration n, final A arg) { } @Override - public Visitable visit(final ContinueStmt n, final A arg) { - SimpleName label = - n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); + public Visitable visit(final ContinueStmt n, final A arg) { + SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setLabel(label); n.setComment(comment); @@ -390,12 +399,13 @@ public Visitable visit(final ContinueStmt n, final A arg) { } @Override - public Visitable visit(final DoStmt n, final A arg) { + public Visitable visit(final DoStmt n, final A arg) { Statement body = (Statement) n.getBody().accept(this, arg); Expression condition = (Expression) n.getCondition().accept(this, arg); NodeList contracts = modifyList(n.getContracts(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || condition == null) return null; + if (body == null || condition == null) + return null; n.setBody(body); n.setCondition(condition); n.setContracts(contracts); @@ -404,37 +414,39 @@ public Visitable visit(final DoStmt n, final A arg) { } @Override - public Visitable visit(final DoubleLiteralExpr n, final A arg) { + public Visitable visit(final DoubleLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final EmptyStmt n, final A arg) { + public Visitable visit(final EmptyStmt n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final EnclosedExpr n, final A arg) { + public Visitable visit(final EnclosedExpr n, final A arg) { Expression inner = (Expression) n.getInner().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (inner == null) return null; + if (inner == null) + return null; n.setInner(inner); n.setComment(comment); return n; } @Override - public Visitable visit(final EnumConstantDeclaration n, final A arg) { + public Visitable visit(final EnumConstantDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList arguments = modifyList(n.getArguments(), arg); NodeList> classBody = modifyList(n.getClassBody(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setArguments(arguments); n.setClassBody(classBody); @@ -444,7 +456,7 @@ public Visitable visit(final EnumConstantDeclaration n, final A arg) { } @Override - public Visitable visit(final EnumDeclaration n, final A arg) { + public Visitable visit(final EnumDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList entries = modifyList(n.getEntries(), arg); @@ -452,7 +464,8 @@ public Visitable visit(final EnumDeclaration n, final A arg) { NodeList> members = modifyList(n.getMembers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setEntries(entries); @@ -464,10 +477,9 @@ public Visitable visit(final EnumDeclaration n, final A arg) { } @Override - public Visitable visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public Visitable visit(final ExplicitConstructorInvocationStmt n, final A arg) { NodeList arguments = modifyList(n.getArguments(), arg); - Expression expression = - n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression expression = n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setArguments(arguments); @@ -478,22 +490,24 @@ public Visitable visit(final ExplicitConstructorInvocationStmt n, final A arg) { } @Override - public Visitable visit(final ExpressionStmt n, final A arg) { + public Visitable visit(final ExpressionStmt n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null) return null; + if (expression == null) + return null; n.setExpression(expression); n.setComment(comment); return n; } @Override - public Visitable visit(final FieldAccessExpr n, final A arg) { + public Visitable visit(final FieldAccessExpr n, final A arg) { SimpleName name = (SimpleName) n.getName().accept(this, arg); Expression scope = (Expression) n.getScope().accept(this, arg); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || scope == null) return null; + if (name == null || scope == null) + return null; n.setName(name); n.setScope(scope); n.setTypeArguments(typeArguments); @@ -502,12 +516,13 @@ public Visitable visit(final FieldAccessExpr n, final A arg) { } @Override - public Visitable visit(final FieldDeclaration n, final A arg) { + public Visitable visit(final FieldDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList variables = modifyList(n.getVariables(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (variables.isEmpty()) return null; + if (variables.isEmpty()) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setVariables(variables); @@ -516,14 +531,14 @@ public Visitable visit(final FieldDeclaration n, final A arg) { } @Override - public Visitable visit(final ForEachStmt n, final A arg) { + public Visitable visit(final ForEachStmt n, final A arg) { Statement body = (Statement) n.getBody().accept(this, arg); NodeList contracts = modifyList(n.getContracts(), arg); Expression iterable = (Expression) n.getIterable().accept(this, arg); - VariableDeclarationExpr variable = - (VariableDeclarationExpr) n.getVariable().accept(this, arg); + VariableDeclarationExpr variable = (VariableDeclarationExpr) n.getVariable().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || iterable == null || variable == null) return null; + if (body == null || iterable == null || variable == null) + return null; n.setBody(body); n.setContracts(contracts); n.setIterable(iterable); @@ -533,15 +548,15 @@ public Visitable visit(final ForEachStmt n, final A arg) { } @Override - public Visitable visit(final ForStmt n, final A arg) { + public Visitable visit(final ForStmt n, final A arg) { Statement body = (Statement) n.getBody().accept(this, arg); - Expression compare = - n.getCompare().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression compare = n.getCompare().map(s -> (Expression) s.accept(this, arg)).orElse(null); NodeList contracts = modifyList(n.getContracts(), arg); NodeList initialization = modifyList(n.getInitialization(), arg); NodeList update = modifyList(n.getUpdate(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null) return null; + if (body == null) + return null; n.setBody(body); n.setCompare(compare); n.setContracts(contracts); @@ -552,13 +567,13 @@ public Visitable visit(final ForStmt n, final A arg) { } @Override - public Visitable visit(final IfStmt n, final A arg) { + public Visitable visit(final IfStmt n, final A arg) { Expression condition = (Expression) n.getCondition().accept(this, arg); - Statement elseStmt = - n.getElseStmt().map(s -> (Statement) s.accept(this, arg)).orElse(null); + Statement elseStmt = n.getElseStmt().map(s -> (Statement) s.accept(this, arg)).orElse(null); Statement thenStmt = (Statement) n.getThenStmt().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (condition == null || thenStmt == null) return null; + if (condition == null || thenStmt == null) + return null; n.setCondition(condition); n.setElseStmt(elseStmt); n.setThenStmt(thenStmt); @@ -567,11 +582,12 @@ public Visitable visit(final IfStmt n, final A arg) { } @Override - public Visitable visit(final InitializerDeclaration n, final A arg) { + public Visitable visit(final InitializerDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null) return null; + if (body == null) + return null; n.setAnnotations(annotations); n.setBody(body); n.setComment(comment); @@ -579,13 +595,13 @@ public Visitable visit(final InitializerDeclaration n, final A arg) { } @Override - public Visitable visit(final InstanceOfExpr n, final A arg) { + public Visitable visit(final InstanceOfExpr n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); - PatternExpr pattern = - n.getPattern().map(s -> (PatternExpr) s.accept(this, arg)).orElse(null); + PatternExpr pattern = n.getPattern().map(s -> (PatternExpr) s.accept(this, arg)).orElse(null); ReferenceType type = (ReferenceType) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null || type == null) return null; + if (expression == null || type == null) + return null; n.setExpression(expression); n.setPattern(pattern); n.setType(type); @@ -594,25 +610,26 @@ public Visitable visit(final InstanceOfExpr n, final A arg) { } @Override - public Visitable visit(final IntegerLiteralExpr n, final A arg) { + public Visitable visit(final IntegerLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final JavadocComment n, final A arg) { + public Visitable visit(final JavadocComment n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final LabeledStmt n, final A arg) { + public Visitable visit(final LabeledStmt n, final A arg) { SimpleName label = (SimpleName) n.getLabel().accept(this, arg); Statement statement = (Statement) n.getStatement().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (label == null || statement == null) return null; + if (label == null || statement == null) + return null; n.setLabel(label); n.setStatement(statement); n.setComment(comment); @@ -620,28 +637,30 @@ public Visitable visit(final LabeledStmt n, final A arg) { } @Override - public Visitable visit(final LongLiteralExpr n, final A arg) { + public Visitable visit(final LongLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final MarkerAnnotationExpr n, final A arg) { + public Visitable visit(final MarkerAnnotationExpr n, final A arg) { Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setName(name); n.setComment(comment); return n; } @Override - public Visitable visit(final MemberValuePair n, final A arg) { + public Visitable visit(final MemberValuePair n, final A arg) { SimpleName name = (SimpleName) n.getName().accept(this, arg); Expression value = (Expression) n.getValue().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || value == null) return null; + if (name == null || value == null) + return null; n.setName(name); n.setValue(value); n.setComment(comment); @@ -649,14 +668,14 @@ public Visitable visit(final MemberValuePair n, final A arg) { } @Override - public Visitable visit(final MethodCallExpr n, final A arg) { + public Visitable visit(final MethodCallExpr n, final A arg) { NodeList arguments = modifyList(n.getArguments(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); - Expression scope = - n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression scope = n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setArguments(arguments); n.setName(name); n.setScope(scope); @@ -666,7 +685,7 @@ public Visitable visit(final MethodCallExpr n, final A arg) { } @Override - public Visitable visit(final MethodDeclaration n, final A arg) { + public Visitable visit(final MethodDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); BlockStmt body = n.getBody().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null); @@ -674,13 +693,12 @@ public Visitable visit(final MethodDeclaration n, final A arg) { NodeList contracts = modifyList(n.getContracts(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); NodeList parameters = modifyList(n.getParameters(), arg); - ReceiverParameter receiverParameter = n.getReceiverParameter() - .map(s -> (ReceiverParameter) s.accept(this, arg)) - .orElse(null); + ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); NodeList thrownExceptions = modifyList(n.getThrownExceptions(), arg); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (type == null || name == null) return null; + if (type == null || name == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setBody(body); @@ -696,21 +714,23 @@ public Visitable visit(final MethodDeclaration n, final A arg) { } @Override - public Visitable visit(final NameExpr n, final A arg) { + public Visitable visit(final NameExpr n, final A arg) { SimpleName name = (SimpleName) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setName(name); n.setComment(comment); return n; } @Override - public Visitable visit(final NormalAnnotationExpr n, final A arg) { + public Visitable visit(final NormalAnnotationExpr n, final A arg) { NodeList pairs = modifyList(n.getPairs(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setPairs(pairs); n.setName(name); n.setComment(comment); @@ -718,22 +738,22 @@ public Visitable visit(final NormalAnnotationExpr n, final A arg) { } @Override - public Visitable visit(final NullLiteralExpr n, final A arg) { + public Visitable visit(final NullLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final ObjectCreationExpr n, final A arg) { + public Visitable visit(final ObjectCreationExpr n, final A arg) { NodeList> anonymousClassBody = modifyList(n.getAnonymousClassBody(), arg); NodeList arguments = modifyList(n.getArguments(), arg); - Expression scope = - n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression scope = n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null); ClassOrInterfaceType type = (ClassOrInterfaceType) n.getType().accept(this, arg); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (type == null) return null; + if (type == null) + return null; n.setAnonymousClassBody(anonymousClassBody); n.setArguments(arguments); n.setScope(scope); @@ -744,11 +764,12 @@ public Visitable visit(final ObjectCreationExpr n, final A arg) { } @Override - public Visitable visit(final PackageDeclaration n, final A arg) { + public Visitable visit(final PackageDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setName(name); n.setComment(comment); @@ -756,14 +777,15 @@ public Visitable visit(final PackageDeclaration n, final A arg) { } @Override - public Visitable visit(final Parameter n, final A arg) { + public Visitable visit(final Parameter n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); NodeList varArgsAnnotations = modifyList(n.getVarArgsAnnotations(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || type == null) return null; + if (name == null || type == null) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setName(name); @@ -774,7 +796,7 @@ public Visitable visit(final Parameter n, final A arg) { } @Override - public Visitable visit(final Name n, final A arg) { + public Visitable visit(final Name n, final A arg) { Name qualifier = n.getQualifier().map(s -> (Name) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setQualifier(qualifier); @@ -783,7 +805,7 @@ public Visitable visit(final Name n, final A arg) { } @Override - public Visitable visit(final PrimitiveType n, final A arg) { + public Visitable visit(final PrimitiveType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); @@ -792,18 +814,19 @@ public Visitable visit(final PrimitiveType n, final A arg) { } @Override - public Visitable visit(final SimpleName n, final A arg) { + public Visitable visit(final SimpleName n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final ArrayType n, final A arg) { + public Visitable visit(final ArrayType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Type componentType = (Type) n.getComponentType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (componentType == null) return null; + if (componentType == null) + return null; n.setAnnotations(annotations); n.setComponentType(componentType); n.setComment(comment); @@ -811,10 +834,9 @@ public Visitable visit(final ArrayType n, final A arg) { } @Override - public Visitable visit(final ArrayCreationLevel n, final A arg) { + public Visitable visit(final ArrayCreationLevel n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); - Expression dimension = - n.getDimension().map(s -> (Expression) s.accept(this, arg)).orElse(null); + Expression dimension = n.getDimension().map(s -> (Expression) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); n.setDimension(dimension); @@ -823,11 +845,12 @@ public Visitable visit(final ArrayCreationLevel n, final A arg) { } @Override - public Visitable visit(final IntersectionType n, final A arg) { + public Visitable visit(final IntersectionType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList elements = modifyList(n.getElements(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (elements.isEmpty()) return null; + if (elements.isEmpty()) + return null; n.setAnnotations(annotations); n.setElements(elements); n.setComment(comment); @@ -835,11 +858,12 @@ public Visitable visit(final IntersectionType n, final A arg) { } @Override - public Visitable visit(final UnionType n, final A arg) { + public Visitable visit(final UnionType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList elements = modifyList(n.getElements(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (elements.isEmpty()) return null; + if (elements.isEmpty()) + return null; n.setAnnotations(annotations); n.setElements(elements); n.setComment(comment); @@ -847,9 +871,8 @@ public Visitable visit(final UnionType n, final A arg) { } @Override - public Visitable visit(final ReturnStmt n, final A arg) { - Expression expression = - n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null); + public Visitable visit(final ReturnStmt n, final A arg) { + Expression expression = n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setExpression(expression); n.setComment(comment); @@ -857,11 +880,12 @@ public Visitable visit(final ReturnStmt n, final A arg) { } @Override - public Visitable visit(final SingleMemberAnnotationExpr n, final A arg) { + public Visitable visit(final SingleMemberAnnotationExpr n, final A arg) { Expression memberValue = (Expression) n.getMemberValue().accept(this, arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (memberValue == null || name == null) return null; + if (memberValue == null || name == null) + return null; n.setMemberValue(memberValue); n.setName(name); n.setComment(comment); @@ -869,14 +893,14 @@ public Visitable visit(final SingleMemberAnnotationExpr n, final A arg) { } @Override - public Visitable visit(final StringLiteralExpr n, final A arg) { + public Visitable visit(final StringLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final SuperExpr n, final A arg) { + public Visitable visit(final SuperExpr n, final A arg) { 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(typeName); @@ -885,9 +909,8 @@ public Visitable visit(final SuperExpr n, final A arg) { } @Override - public Visitable visit(final SwitchEntry n, final A arg) { - Expression guard = - n.getGuard().map(s -> (Expression) s.accept(this, arg)).orElse(null); + public Visitable visit(final SwitchEntry n, final A arg) { + Expression guard = n.getGuard().map(s -> (Expression) s.accept(this, arg)).orElse(null); NodeList labels = modifyList(n.getLabels(), arg); NodeList statements = modifyList(n.getStatements(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -899,11 +922,12 @@ public Visitable visit(final SwitchEntry n, final A arg) { } @Override - public Visitable visit(final SwitchStmt n, final A arg) { + public Visitable visit(final SwitchStmt n, final A arg) { NodeList entries = modifyList(n.getEntries(), arg); Expression selector = (Expression) n.getSelector().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (selector == null) return null; + if (selector == null) + return null; n.setEntries(entries); n.setSelector(selector); n.setComment(comment); @@ -911,11 +935,12 @@ public Visitable visit(final SwitchStmt n, final A arg) { } @Override - public Visitable visit(final SynchronizedStmt n, final A arg) { + public Visitable visit(final SynchronizedStmt n, final A arg) { BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); Expression expression = (Expression) n.getExpression().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || expression == null) return null; + if (body == null || expression == null) + return null; n.setBody(body); n.setExpression(expression); n.setComment(comment); @@ -923,7 +948,7 @@ public Visitable visit(final SynchronizedStmt n, final A arg) { } @Override - public Visitable visit(final ThisExpr n, final A arg) { + public Visitable visit(final ThisExpr n, final A arg) { 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(typeName); @@ -932,24 +957,25 @@ public Visitable visit(final ThisExpr n, final A arg) { } @Override - public Visitable visit(final ThrowStmt n, final A arg) { + public Visitable visit(final ThrowStmt n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null) return null; + if (expression == null) + return null; n.setExpression(expression); n.setComment(comment); return n; } @Override - public Visitable visit(final TryStmt n, final A arg) { + public Visitable visit(final TryStmt n, final A arg) { NodeList catchClauses = modifyList(n.getCatchClauses(), arg); - BlockStmt finallyBlock = - n.getFinallyBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null); + BlockStmt finallyBlock = n.getFinallyBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null); NodeList resources = modifyList(n.getResources(), arg); BlockStmt tryBlock = (BlockStmt) n.getTryBlock().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (tryBlock == null) return null; + if (tryBlock == null) + return null; n.setCatchClauses(catchClauses); n.setFinallyBlock(finallyBlock); n.setResources(resources); @@ -959,34 +985,35 @@ public Visitable visit(final TryStmt n, final A arg) { } @Override - public Visitable visit(final LocalClassDeclarationStmt n, final A arg) { - ClassOrInterfaceDeclaration classDeclaration = - (ClassOrInterfaceDeclaration) n.getClassDeclaration().accept(this, arg); + public Visitable visit(final LocalClassDeclarationStmt n, final A arg) { + ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) n.getClassDeclaration().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (classDeclaration == null) return null; + if (classDeclaration == null) + return null; n.setClassDeclaration(classDeclaration); n.setComment(comment); return n; } @Override - public Visitable visit(final LocalRecordDeclarationStmt n, final A arg) { - RecordDeclaration recordDeclaration = - (RecordDeclaration) n.getRecordDeclaration().accept(this, arg); + public Visitable visit(final LocalRecordDeclarationStmt n, final A arg) { + RecordDeclaration recordDeclaration = (RecordDeclaration) n.getRecordDeclaration().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (recordDeclaration == null) return null; + if (recordDeclaration == null) + return null; n.setRecordDeclaration(recordDeclaration); n.setComment(comment); return n; } @Override - public Visitable visit(final TypeParameter n, final A arg) { + public Visitable visit(final TypeParameter n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); NodeList typeBound = modifyList(n.getTypeBound(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setName(name); n.setTypeBound(typeBound); @@ -995,17 +1022,18 @@ public Visitable visit(final TypeParameter n, final A arg) { } @Override - public Visitable visit(final UnaryExpr n, final A arg) { + public Visitable visit(final UnaryExpr n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null) return null; + if (expression == null) + return null; n.setExpression(expression); n.setComment(comment); return n; } @Override - public Visitable visit(final UnknownType n, final A arg) { + public Visitable visit(final UnknownType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); @@ -1014,12 +1042,13 @@ public Visitable visit(final UnknownType n, final A arg) { } @Override - public Visitable visit(final VariableDeclarationExpr n, final A arg) { + public Visitable visit(final VariableDeclarationExpr n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList variables = modifyList(n.getVariables(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (variables.isEmpty()) return null; + if (variables.isEmpty()) + return null; n.setAnnotations(annotations); n.setModifiers(modifiers); n.setVariables(variables); @@ -1028,13 +1057,13 @@ public Visitable visit(final VariableDeclarationExpr n, final A arg) { } @Override - public Visitable visit(final VariableDeclarator n, final A arg) { - Expression initializer = - n.getInitializer().map(s -> (Expression) s.accept(this, arg)).orElse(null); + public Visitable visit(final VariableDeclarator n, final A arg) { + Expression initializer = n.getInitializer().map(s -> (Expression) s.accept(this, arg)).orElse(null); SimpleName name = (SimpleName) n.getName().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || type == null) return null; + if (name == null || type == null) + return null; n.setInitializer(initializer); n.setName(name); n.setType(type); @@ -1043,7 +1072,7 @@ public Visitable visit(final VariableDeclarator n, final A arg) { } @Override - public Visitable visit(final VoidType n, final A arg) { + public Visitable visit(final VoidType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); @@ -1052,12 +1081,13 @@ public Visitable visit(final VoidType n, final A arg) { } @Override - public Visitable visit(final WhileStmt n, final A arg) { + public Visitable visit(final WhileStmt n, final A arg) { Statement body = (Statement) n.getBody().accept(this, arg); Expression condition = (Expression) n.getCondition().accept(this, arg); NodeList contracts = modifyList(n.getContracts(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null || condition == null) return null; + if (body == null || condition == null) + return null; n.setBody(body); n.setCondition(condition); n.setContracts(contracts); @@ -1066,13 +1096,10 @@ public Visitable visit(final WhileStmt n, final A arg) { } @Override - public Visitable visit(final WildcardType n, final A arg) { + public Visitable visit(final WildcardType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); - ReferenceType extendedType = n.getExtendedType() - .map(s -> (ReferenceType) s.accept(this, arg)) - .orElse(null); - ReferenceType superType = - n.getSuperType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null); + ReferenceType extendedType = n.getExtendedType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null); + ReferenceType superType = n.getSuperType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); n.setExtendedType(extendedType); @@ -1082,12 +1109,13 @@ public Visitable visit(final WildcardType n, final A arg) { } @Override - public Visitable visit(final LambdaExpr n, final A arg) { + public Visitable visit(final LambdaExpr n, final A arg) { Statement body = (Statement) n.getBody().accept(this, arg); NodeList contracts = modifyList(n.getContracts(), arg); NodeList parameters = modifyList(n.getParameters(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (body == null) return null; + if (body == null) + return null; n.setBody(body); n.setContracts(contracts); n.setParameters(parameters); @@ -1096,11 +1124,12 @@ public Visitable visit(final LambdaExpr n, final A arg) { } @Override - public Visitable visit(final MethodReferenceExpr n, final A arg) { + public Visitable visit(final MethodReferenceExpr n, final A arg) { Expression scope = (Expression) n.getScope().accept(this, arg); NodeList typeArguments = modifyList(n.getTypeArguments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (scope == null) return null; + if (scope == null) + return null; n.setScope(scope); n.setTypeArguments(typeArguments); n.setComment(comment); @@ -1108,17 +1137,18 @@ public Visitable visit(final MethodReferenceExpr n, final A arg) { } @Override - public Visitable visit(final TypeExpr n, final A arg) { + public Visitable visit(final TypeExpr n, final A arg) { Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (type == null) return null; + if (type == null) + return null; n.setType(type); n.setComment(comment); return n; } @Override - public Visitable visit(NodeList n, A arg) { + public Visitable visit(NodeList n, A arg) { if (n.isEmpty()) { return n; } @@ -1139,24 +1169,25 @@ public Visitable visit(NodeList n, A arg) { } @Override - public Node visit(final ImportDeclaration n, final A arg) { + public Node visit(final ImportDeclaration n, final A arg) { Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setName(name); n.setComment(comment); return n; } @Override - public Visitable visit(final BlockComment n, final A arg) { + public Visitable visit(final BlockComment n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final LineComment n, final A arg) { + public Visitable visit(final LineComment n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; @@ -1170,12 +1201,13 @@ private NodeList modifyList(Optional> list, A ar return list.map(ns -> modifyList(ns, arg)).orElse(null); } - public Visitable visit(final ModuleDeclaration n, final A arg) { + public Visitable visit(final ModuleDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList directives = modifyList(n.getDirectives(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setAnnotations(annotations); n.setDirectives(directives); n.setName(name); @@ -1183,11 +1215,12 @@ public Visitable visit(final ModuleDeclaration n, final A arg) { return n; } - public Visitable visit(final ModuleRequiresDirective n, final A arg) { + public Visitable visit(final ModuleRequiresDirective n, final A arg) { NodeList modifiers = modifyList(n.getModifiers(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setModifiers(modifiers); n.setName(name); n.setComment(comment); @@ -1195,11 +1228,12 @@ public Visitable visit(final ModuleRequiresDirective n, final A arg) { } @Override() - public Visitable visit(final ModuleExportsDirective n, final A arg) { + public Visitable visit(final ModuleExportsDirective n, final A arg) { NodeList moduleNames = modifyList(n.getModuleNames(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setModuleNames(moduleNames); n.setName(name); n.setComment(comment); @@ -1207,11 +1241,12 @@ public Visitable visit(final ModuleExportsDirective n, final A arg) { } @Override() - public Visitable visit(final ModuleProvidesDirective n, final A arg) { + public Visitable visit(final ModuleProvidesDirective n, final A arg) { Name name = (Name) n.getName().accept(this, arg); NodeList with = modifyList(n.getWith(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setName(name); n.setWith(with); n.setComment(comment); @@ -1219,21 +1254,23 @@ public Visitable visit(final ModuleProvidesDirective n, final A arg) { } @Override() - public Visitable visit(final ModuleUsesDirective n, final A arg) { + public Visitable visit(final ModuleUsesDirective n, final A arg) { Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setName(name); n.setComment(comment); return n; } @Override - public Visitable visit(final ModuleOpensDirective n, final A arg) { + public Visitable visit(final ModuleOpensDirective n, final A arg) { NodeList moduleNames = modifyList(n.getModuleNames(), arg); Name name = (Name) n.getName().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null) return null; + if (name == null) + return null; n.setModuleNames(moduleNames); n.setName(name); n.setComment(comment); @@ -1241,19 +1278,20 @@ public Visitable visit(final ModuleOpensDirective n, final A arg) { } @Override - public Visitable visit(final UnparsableStmt n, final A arg) { + public Visitable visit(final UnparsableStmt n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final ReceiverParameter n, final A arg) { + public Visitable visit(final ReceiverParameter n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Name name = (Name) n.getName().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || type == null) return null; + if (name == null || type == null) + return null; n.setAnnotations(annotations); n.setName(name); n.setType(type); @@ -1262,7 +1300,7 @@ public Visitable visit(final ReceiverParameter n, final A arg) { } @Override - public Visitable visit(final VarType n, final A arg) { + public Visitable visit(final VarType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setAnnotations(annotations); @@ -1271,18 +1309,19 @@ public Visitable visit(final VarType n, final A arg) { } @Override - public Visitable visit(final Modifier n, final A arg) { + public Visitable visit(final Modifier n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final SwitchExpr n, final A arg) { + public Visitable visit(final SwitchExpr n, final A arg) { NodeList entries = modifyList(n.getEntries(), arg); Expression selector = (Expression) n.getSelector().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (selector == null) return null; + if (selector == null) + return null; n.setEntries(entries); n.setSelector(selector); n.setComment(comment); @@ -1290,29 +1329,31 @@ public Visitable visit(final SwitchExpr n, final A arg) { } @Override - public Visitable visit(final YieldStmt n, final A arg) { + public Visitable visit(final YieldStmt n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (expression == null) return null; + if (expression == null) + return null; n.setExpression(expression); n.setComment(comment); return n; } @Override - public Visitable visit(final TextBlockLiteralExpr n, final A arg) { + public Visitable visit(final TextBlockLiteralExpr n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final TypePatternExpr n, final A arg) { + public Visitable visit(final TypePatternExpr n, final A arg) { NodeList modifiers = modifyList(n.getModifiers(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (name == null || type == null) return null; + if (name == null || type == null) + return null; n.setModifiers(modifiers); n.setName(name); n.setType(type); @@ -1321,12 +1362,13 @@ public Visitable visit(final TypePatternExpr n, final A arg) { } @Override - public Visitable visit(final RecordPatternExpr n, final A arg) { + public Visitable visit(final RecordPatternExpr n, final A arg) { NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList patternList = modifyList(n.getPatternList(), arg); Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); - if (type == null) return null; + if (type == null) + return null; n.setModifiers(modifiers); n.setPatternList(patternList); n.setType(type); @@ -1335,7 +1377,7 @@ public Visitable visit(final RecordPatternExpr n, final A arg) { } @Override - public Visitable visit(final JmlClauseLabel n, final A arg) { + public Visitable visit(final JmlClauseLabel n, final A arg) { Expression expr = (Expression) n.getExpr().accept(this, arg); SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); @@ -1350,7 +1392,7 @@ public Visitable visit(final JmlClauseLabel n, final A arg) { } @Override - public Visitable visit(final JmlExpressionStmt n, final A arg) { + public Visitable visit(final JmlExpressionStmt n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); NodeList jmlTags = modifyList(n.getJmlTags(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1363,7 +1405,7 @@ public Visitable visit(final JmlExpressionStmt n, final A arg) { } @Override - public Visitable visit(final JmlQuantifiedExpr n, final A arg) { + public Visitable visit(final JmlQuantifiedExpr n, final A arg) { NodeList expressions = modifyList(n.getExpressions(), arg); NodeList variables = modifyList(n.getVariables(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1376,7 +1418,7 @@ public Visitable visit(final JmlQuantifiedExpr n, final A arg) { } @Override - public Visitable visit(final JmlLabelExpr n, final A arg) { + public Visitable visit(final JmlLabelExpr n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); SimpleName label = (SimpleName) n.getLabel().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1389,7 +1431,7 @@ public Visitable visit(final JmlLabelExpr n, final A arg) { } @Override - public Visitable visit(final JmlLetExpr n, final A arg) { + public Visitable visit(final JmlLetExpr n, final A arg) { Expression body = (Expression) n.getBody().accept(this, arg); VariableDeclarationExpr variables = (VariableDeclarationExpr) n.getVariables().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1402,7 +1444,7 @@ public Visitable visit(final JmlLetExpr n, final A arg) { } @Override - public Visitable visit(final JmlMultiCompareExpr n, final A arg) { + public Visitable visit(final JmlMultiCompareExpr n, final A arg) { NodeList expressions = modifyList(n.getExpressions(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); if (expressions.isEmpty()) @@ -1413,7 +1455,7 @@ public Visitable visit(final JmlMultiCompareExpr n, final A arg) { } @Override - public Visitable visit(final JmlSimpleExprClause n, final A arg) { + public Visitable visit(final JmlSimpleExprClause n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); NodeList heaps = modifyList(n.getHeaps(), arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); @@ -1428,7 +1470,7 @@ public Visitable visit(final JmlSimpleExprClause n, final A arg) { } @Override - public Visitable visit(final JmlSignalsClause n, final A arg) { + public Visitable visit(final JmlSignalsClause n, final A arg) { Expression expression = (Expression) n.getExpression().accept(this, arg); Parameter parameter = (Parameter) n.getParameter().accept(this, arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); @@ -1443,7 +1485,7 @@ public Visitable visit(final JmlSignalsClause n, final A arg) { } @Override - public Visitable visit(final JmlSignalsOnlyClause n, final A arg) { + public Visitable visit(final JmlSignalsOnlyClause n, final A arg) { NodeList types = modifyList(n.getTypes(), arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1454,7 +1496,7 @@ public Visitable visit(final JmlSignalsOnlyClause n, final A arg) { } @Override - public Visitable visit(final JmlUnreachableStmt n, final A arg) { + public Visitable visit(final JmlUnreachableStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setJmlTags(jmlTags); @@ -1463,7 +1505,7 @@ public Visitable visit(final JmlUnreachableStmt n, final A arg) { } @Override - public Visitable visit(final JmlCallableClause n, final A arg) { + public Visitable visit(final JmlCallableClause n, final A arg) { NodeList methodSignatures = modifyList(n.getMethodSignatures(), arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1474,7 +1516,7 @@ public Visitable visit(final JmlCallableClause n, final A arg) { } @Override - public Visitable visit(final JmlForallClause n, final A arg) { + public Visitable visit(final JmlForallClause n, final A arg) { NodeList boundedVariables = modifyList(n.getBoundedVariables(), arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1485,7 +1527,7 @@ public Visitable visit(final JmlForallClause n, final A arg) { } @Override - public Visitable visit(final JmlRefiningStmt n, final A arg) { + public Visitable visit(final JmlRefiningStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setJmlTags(jmlTags); @@ -1494,7 +1536,7 @@ public Visitable visit(final JmlRefiningStmt n, final A arg) { } @Override - public Visitable visit(final JmlClauseIf n, final A arg) { + public Visitable visit(final JmlClauseIf n, final A arg) { Expression condition = (Expression) n.getCondition().accept(this, arg); Expression then = (Expression) n.getThen().accept(this, arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); @@ -1509,7 +1551,7 @@ public Visitable visit(final JmlClauseIf n, final A arg) { } @Override - public Visitable visit(final JmlClassExprDeclaration n, final A arg) { + public Visitable visit(final JmlClassExprDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); Expression invariant = (Expression) n.getInvariant().accept(this, arg); @@ -1530,7 +1572,7 @@ public Visitable visit(final JmlClassExprDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlClassAccessibleDeclaration n, final A arg) { + public Visitable visit(final JmlClassAccessibleDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList expressions = modifyList(n.getExpressions(), arg); @@ -1551,7 +1593,7 @@ public Visitable visit(final JmlClassAccessibleDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlRepresentsDeclaration n, final A arg) { + public Visitable visit(final JmlRepresentsDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); Expression expr = (Expression) n.getExpr().accept(this, arg); @@ -1570,7 +1612,7 @@ public Visitable visit(final JmlRepresentsDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlContract n, final A arg) { + public Visitable visit(final JmlContract n, final A arg) { NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList clauses = modifyList(n.getClauses(), arg); NodeList jmlTags = modifyList(n.getJmlTags(), arg); @@ -1587,7 +1629,7 @@ public Visitable visit(final JmlContract n, final A arg) { } @Override - public Visitable visit(final JmlSetComprehensionExpr n, final A arg) { + public Visitable visit(final JmlSetComprehensionExpr n, final A arg) { VariableDeclarator binding = (VariableDeclarator) n.getBinding().accept(this, arg); Expression predicate = (Expression) n.getPredicate().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1600,7 +1642,7 @@ public Visitable visit(final JmlSetComprehensionExpr n, final A arg) { } @Override - public Visitable visit(final JmlGhostStmt n, final A arg) { + public Visitable visit(final JmlGhostStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); Statement statement = (Statement) n.getStatement().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1613,7 +1655,7 @@ public Visitable visit(final JmlGhostStmt n, final A arg) { } @Override - public Visitable visit(final JmlMethodDeclaration n, final A arg) { + public Visitable visit(final JmlMethodDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); JmlContract contract = n.getContract().map(s -> (JmlContract) s.accept(this, arg)).orElse(null); NodeList jmlTags = modifyList(n.getJmlTags(), arg); @@ -1630,7 +1672,7 @@ public Visitable visit(final JmlMethodDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlBinaryInfixExpr n, final A arg) { + public Visitable visit(final JmlBinaryInfixExpr n, final A arg) { Expression left = (Expression) n.getLeft().accept(this, arg); SimpleName operator = (SimpleName) n.getOperator().accept(this, arg); Expression right = (Expression) n.getRight().accept(this, arg); @@ -1645,7 +1687,7 @@ public Visitable visit(final JmlBinaryInfixExpr n, final A arg) { } @Override - public Visitable visit(final JmlDocDeclaration n, final A arg) { + public Visitable visit(final JmlDocDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList jmlComments = modifyList(n.getJmlComments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1656,7 +1698,7 @@ public Visitable visit(final JmlDocDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlDocStmt n, final A arg) { + public Visitable visit(final JmlDocStmt n, final A arg) { NodeList jmlComments = modifyList(n.getJmlComments(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setJmlComments(jmlComments); @@ -1665,14 +1707,14 @@ public Visitable visit(final JmlDocStmt n, final A arg) { } @Override - public Visitable visit(final JmlDoc n, final A arg) { + public Visitable visit(final JmlDoc n, final A arg) { Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setComment(comment); return n; } @Override - public Visitable visit(final JmlDocType n, final A arg) { + public Visitable visit(final JmlDocType n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); NodeList modifiers = modifyList(n.getModifiers(), arg); NodeList jmlComments = modifyList(n.getJmlComments(), arg); @@ -1691,7 +1733,7 @@ public Visitable visit(final JmlDocType n, final A arg) { } @Override - public Visitable visit(final JmlFieldDeclaration n, final A arg) { + public Visitable visit(final JmlFieldDeclaration n, final A arg) { NodeList annotations = modifyList(n.getAnnotations(), arg); FieldDeclaration decl = (FieldDeclaration) n.getDecl().accept(this, arg); NodeList jmlTags = modifyList(n.getJmlTags(), arg); @@ -1706,7 +1748,7 @@ public Visitable visit(final JmlFieldDeclaration n, final A arg) { } @Override - public Visitable visit(final JmlOldClause n, final A arg) { + public Visitable visit(final JmlOldClause n, final A arg) { VariableDeclarationExpr declarations = (VariableDeclarationExpr) n.getDeclarations().accept(this, arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1719,7 +1761,7 @@ public Visitable visit(final JmlOldClause n, final A arg) { } @Override - public Visitable visit(final JmlTypeExpr n, final A arg) { + public Visitable visit(final JmlTypeExpr n, final A arg) { Type type = (Type) n.getType().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); if (type == null) @@ -1730,7 +1772,7 @@ public Visitable visit(final JmlTypeExpr n, final A arg) { } @Override - public Visitable visit(final JmlMultiExprClause n, final A arg) { + public Visitable visit(final JmlMultiExprClause n, final A arg) { NodeList expressions = modifyList(n.getExpressions(), arg); NodeList heaps = modifyList(n.getHeaps(), arg); SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null); @@ -1743,7 +1785,7 @@ public Visitable visit(final JmlMultiExprClause n, final A arg) { } @Override - public Visitable visit(final JmlBeginStmt n, final A arg) { + public Visitable visit(final JmlBeginStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setJmlTags(jmlTags); @@ -1752,7 +1794,7 @@ public Visitable visit(final JmlBeginStmt n, final A arg) { } @Override - public Visitable visit(final JmlEndStmt n, final A arg) { + public Visitable visit(final JmlEndStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); n.setJmlTags(jmlTags); @@ -1761,7 +1803,7 @@ public Visitable visit(final JmlEndStmt n, final A arg) { } @Override - public Visitable visit(final JmlLabelStmt n, final A arg) { + public Visitable visit(final JmlLabelStmt n, final A arg) { NodeList jmlTags = modifyList(n.getJmlTags(), arg); SimpleName label = (SimpleName) n.getLabel().accept(this, arg); Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null); @@ -1774,7 +1816,7 @@ public Visitable visit(final JmlLabelStmt n, final A arg) { } @Override - public Visitable visit(final JmlMethodSignature n, final A arg) { + public Visitable visit(final JmlMethodSignature n, final A arg) { NodeList argumentTypes = modifyList(n.getArgumentTypes(), arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); Type receiver = n.getReceiver().map(s -> (Type) s.accept(this, arg)).orElse(null); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java index c397e33629..ac20c69b14 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java @@ -29,10 +29,14 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; - import java.util.Optional; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; -public class NoCommentEqualsVisitor implements GenericVisitor { +public class NoCommentEqualsVisitor implements GenericVisitor { private static final NoCommentEqualsVisitor SINGLETON = new NoCommentEqualsVisitor(); @@ -90,833 +94,1060 @@ private boolean objEquals(final Object n, final Object n2) { } @Override - public Boolean visit(final CompilationUnit n, final Visitable arg) { + public Boolean visit(final CompilationUnit n, final Visitable arg) { final CompilationUnit n2 = (CompilationUnit) arg; - if (!nodesEquals(n.getImports(), n2.getImports())) return false; - if (!nodeEquals(n.getModule(), n2.getModule())) return false; - if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) return false; - if (!nodesEquals(n.getTypes(), n2.getTypes())) return false; + if (!nodesEquals(n.getImports(), n2.getImports())) + return false; + if (!nodeEquals(n.getModule(), n2.getModule())) + return false; + if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) + return false; + if (!nodesEquals(n.getTypes(), n2.getTypes())) + return false; return true; } @Override - public Boolean visit(final PackageDeclaration n, final Visitable arg) { + public Boolean visit(final PackageDeclaration n, final Visitable arg) { final PackageDeclaration n2 = (PackageDeclaration) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final TypeParameter n, final Visitable arg) { + public Boolean visit(final TypeParameter n, final Visitable arg) { final TypeParameter n2 = (TypeParameter) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final LineComment n, final Visitable arg) { + public Boolean visit(final LineComment n, final Visitable arg) { return true; } @Override - public Boolean visit(final BlockComment n, final Visitable arg) { + public Boolean visit(final BlockComment n, final Visitable arg) { return true; } @Override - public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg; - if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) return false; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!objEquals(n.isInterface(), n2.isInterface())) return false; - if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) + return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!objEquals(n.isInterface(), n2.isInterface())) + return false; + if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final EnumDeclaration n, final Visitable arg) { + public Boolean visit(final EnumDeclaration n, final Visitable arg) { final EnumDeclaration n2 = (EnumDeclaration) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { + public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodesEquals(n.getClassBody(), n2.getClassBody())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodesEquals(n.getClassBody(), n2.getClassBody())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { final AnnotationDeclaration n2 = (AnnotationDeclaration) arg; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg; - if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final FieldDeclaration n, final Visitable arg) { + public Boolean visit(final FieldDeclaration n, final Visitable arg) { final FieldDeclaration n2 = (FieldDeclaration) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getVariables(), n2.getVariables())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getVariables(), n2.getVariables())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final VariableDeclarator n, final Visitable arg) { + public Boolean visit(final VariableDeclarator n, final Visitable arg) { final VariableDeclarator n2 = (VariableDeclarator) arg; - if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getInitializer(), n2.getInitializer())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { final ConstructorDeclaration n2 = (ConstructorDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final MethodDeclaration n, final Visitable arg) { + public Boolean visit(final MethodDeclaration n, final Visitable arg) { final MethodDeclaration n2 = (MethodDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final Parameter n, final Visitable arg) { + public Boolean visit(final Parameter n, final Visitable arg) { final Parameter n2 = (Parameter) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!objEquals(n.isVarArgs(), n2.isVarArgs())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!objEquals(n.isVarArgs(), n2.isVarArgs())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) + return false; return true; } @Override - public Boolean visit(final InitializerDeclaration n, final Visitable arg) { + public Boolean visit(final InitializerDeclaration n, final Visitable arg) { final InitializerDeclaration n2 = (InitializerDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!objEquals(n.isStatic(), n2.isStatic())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!objEquals(n.isStatic(), n2.isStatic())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final JavadocComment n, final Visitable arg) { + public Boolean visit(final JavadocComment n, final Visitable arg) { return true; } @Override - public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final PrimitiveType n, final Visitable arg) { + public Boolean visit(final PrimitiveType n, final Visitable arg) { final PrimitiveType n2 = (PrimitiveType) arg; - if (!objEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!objEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final ArrayType n, final Visitable arg) { + public Boolean visit(final ArrayType n, final Visitable arg) { final ArrayType n2 = (ArrayType) arg; - if (!nodeEquals(n.getComponentType(), n2.getComponentType())) return false; - if (!objEquals(n.getOrigin(), n2.getOrigin())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getComponentType(), n2.getComponentType())) + return false; + if (!objEquals(n.getOrigin(), n2.getOrigin())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { + public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { final ArrayCreationLevel n2 = (ArrayCreationLevel) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getDimension(), n2.getDimension())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getDimension(), n2.getDimension())) + return false; return true; } @Override - public Boolean visit(final IntersectionType n, final Visitable arg) { + public Boolean visit(final IntersectionType n, final Visitable arg) { final IntersectionType n2 = (IntersectionType) arg; - if (!nodesEquals(n.getElements(), n2.getElements())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getElements(), n2.getElements())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final UnionType n, final Visitable arg) { + public Boolean visit(final UnionType n, final Visitable arg) { final UnionType n2 = (UnionType) arg; - if (!nodesEquals(n.getElements(), n2.getElements())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getElements(), n2.getElements())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final VoidType n, final Visitable arg) { + public Boolean visit(final VoidType n, final Visitable arg) { final VoidType n2 = (VoidType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final WildcardType n, final Visitable arg) { + public Boolean visit(final WildcardType n, final Visitable arg) { final WildcardType n2 = (WildcardType) arg; - if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) return false; - if (!nodeEquals(n.getSuperType(), n2.getSuperType())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) + return false; + if (!nodeEquals(n.getSuperType(), n2.getSuperType())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final UnknownType n, final Visitable arg) { + public Boolean visit(final UnknownType n, final Visitable arg) { final UnknownType n2 = (UnknownType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { + public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { final ArrayAccessExpr n2 = (ArrayAccessExpr) arg; - if (!nodeEquals(n.getIndex(), n2.getIndex())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodeEquals(n.getIndex(), n2.getIndex())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { + public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { final ArrayCreationExpr n2 = (ArrayCreationExpr) arg; - if (!nodeEquals(n.getElementType(), n2.getElementType())) return false; - if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false; - if (!nodesEquals(n.getLevels(), n2.getLevels())) return false; + if (!nodeEquals(n.getElementType(), n2.getElementType())) + return false; + if (!nodeEquals(n.getInitializer(), n2.getInitializer())) + return false; + if (!nodesEquals(n.getLevels(), n2.getLevels())) + return false; return true; } @Override - public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { + public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg; - if (!nodesEquals(n.getValues(), n2.getValues())) return false; + if (!nodesEquals(n.getValues(), n2.getValues())) + return false; return true; } @Override - public Boolean visit(final AssignExpr n, final Visitable arg) { + public Boolean visit(final AssignExpr n, final Visitable arg) { final AssignExpr n2 = (AssignExpr) arg; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; - if (!nodeEquals(n.getTarget(), n2.getTarget())) return false; - if (!nodeEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; + if (!nodeEquals(n.getTarget(), n2.getTarget())) + return false; + if (!nodeEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final BinaryExpr n, final Visitable arg) { + public Boolean visit(final BinaryExpr n, final Visitable arg) { final BinaryExpr n2 = (BinaryExpr) arg; - if (!nodeEquals(n.getLeft(), n2.getLeft())) return false; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; - if (!nodeEquals(n.getRight(), n2.getRight())) return false; + if (!nodeEquals(n.getLeft(), n2.getLeft())) + return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; + if (!nodeEquals(n.getRight(), n2.getRight())) + return false; return true; } @Override - public Boolean visit(final CastExpr n, final Visitable arg) { + public Boolean visit(final CastExpr n, final Visitable arg) { final CastExpr n2 = (CastExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final ClassExpr n, final Visitable arg) { + public Boolean visit(final ClassExpr n, final Visitable arg) { final ClassExpr n2 = (ClassExpr) arg; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final ConditionalExpr n, final Visitable arg) { + public Boolean visit(final ConditionalExpr n, final Visitable arg) { final ConditionalExpr n2 = (ConditionalExpr) arg; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; - if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) return false; - if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; + if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) + return false; + if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) + return false; return true; } @Override - public Boolean visit(final EnclosedExpr n, final Visitable arg) { + public Boolean visit(final EnclosedExpr n, final Visitable arg) { final EnclosedExpr n2 = (EnclosedExpr) arg; - if (!nodeEquals(n.getInner(), n2.getInner())) return false; + if (!nodeEquals(n.getInner(), n2.getInner())) + return false; return true; } @Override - public Boolean visit(final FieldAccessExpr n, final Visitable arg) { + public Boolean visit(final FieldAccessExpr n, final Visitable arg) { final FieldAccessExpr n2 = (FieldAccessExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; return true; } @Override - public Boolean visit(final InstanceOfExpr n, final Visitable arg) { + public Boolean visit(final InstanceOfExpr n, final Visitable arg) { final InstanceOfExpr n2 = (InstanceOfExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!nodeEquals(n.getPattern(), n2.getPattern())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!nodeEquals(n.getPattern(), n2.getPattern())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final StringLiteralExpr n, final Visitable arg) { + public Boolean visit(final StringLiteralExpr n, final Visitable arg) { final StringLiteralExpr n2 = (StringLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { + public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final LongLiteralExpr n, final Visitable arg) { + public Boolean visit(final LongLiteralExpr n, final Visitable arg) { final LongLiteralExpr n2 = (LongLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final CharLiteralExpr n, final Visitable arg) { + public Boolean visit(final CharLiteralExpr n, final Visitable arg) { final CharLiteralExpr n2 = (CharLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { + public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { + public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg; - if (!objEquals(n.isValue(), n2.isValue())) return false; + if (!objEquals(n.isValue(), n2.isValue())) + return false; return true; } @Override - public Boolean visit(final NullLiteralExpr n, final Visitable arg) { + public Boolean visit(final NullLiteralExpr n, final Visitable arg) { return true; } @Override - public Boolean visit(final MethodCallExpr n, final Visitable arg) { + public Boolean visit(final MethodCallExpr n, final Visitable arg) { final MethodCallExpr n2 = (MethodCallExpr) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; return true; } @Override - public Boolean visit(final NameExpr n, final Visitable arg) { + public Boolean visit(final NameExpr n, final Visitable arg) { final NameExpr n2 = (NameExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { + public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { final ObjectCreationExpr n2 = (ObjectCreationExpr) arg; - if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) return false; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; + if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) + return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; return true; } @Override - public Boolean visit(final Name n, final Visitable arg) { + public Boolean visit(final Name n, final Visitable arg) { final Name n2 = (Name) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; - if (!nodeEquals(n.getQualifier(), n2.getQualifier())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; + if (!nodeEquals(n.getQualifier(), n2.getQualifier())) + return false; return true; } @Override - public Boolean visit(final SimpleName n, final Visitable arg) { + public Boolean visit(final SimpleName n, final Visitable arg) { final SimpleName n2 = (SimpleName) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; return true; } @Override - public Boolean visit(final ThisExpr n, final Visitable arg) { + public Boolean visit(final ThisExpr n, final Visitable arg) { final ThisExpr n2 = (ThisExpr) arg; - if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false; + if (!nodeEquals(n.getTypeName(), n2.getTypeName())) + return false; return true; } @Override - public Boolean visit(final SuperExpr n, final Visitable arg) { + public Boolean visit(final SuperExpr n, final Visitable arg) { final SuperExpr n2 = (SuperExpr) arg; - if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false; + if (!nodeEquals(n.getTypeName(), n2.getTypeName())) + return false; return true; } @Override - public Boolean visit(final UnaryExpr n, final Visitable arg) { + public Boolean visit(final UnaryExpr n, final Visitable arg) { final UnaryExpr n2 = (UnaryExpr) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!objEquals(n.getOperator(), n2.getOperator())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!objEquals(n.getOperator(), n2.getOperator())) + return false; return true; } @Override - public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { + public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getVariables(), n2.getVariables())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getVariables(), n2.getVariables())) + return false; return true; } @Override - public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { + public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { + public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg; - if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { + public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg; - if (!nodesEquals(n.getPairs(), n2.getPairs())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getPairs(), n2.getPairs())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final MemberValuePair n, final Visitable arg) { + public Boolean visit(final MemberValuePair n, final Visitable arg) { final MemberValuePair n2 = (MemberValuePair) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getValue(), n2.getValue())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { + public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg; - if (!nodesEquals(n.getArguments(), n2.getArguments())) return false; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; - if (!objEquals(n.isThis(), n2.isThis())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; + if (!nodesEquals(n.getArguments(), n2.getArguments())) + return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; + if (!objEquals(n.isThis(), n2.isThis())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; return true; } @Override - public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { final LocalClassDeclarationStmt n2 = (LocalClassDeclarationStmt) arg; - if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) return false; + if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) + return false; return true; } @Override - public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { final LocalRecordDeclarationStmt n2 = (LocalRecordDeclarationStmt) arg; - if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) return false; + if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) + return false; return true; } @Override - public Boolean visit(final AssertStmt n, final Visitable arg) { + public Boolean visit(final AssertStmt n, final Visitable arg) { final AssertStmt n2 = (AssertStmt) arg; - if (!nodeEquals(n.getCheck(), n2.getCheck())) return false; - if (!nodeEquals(n.getMessage(), n2.getMessage())) return false; + if (!nodeEquals(n.getCheck(), n2.getCheck())) + return false; + if (!nodeEquals(n.getMessage(), n2.getMessage())) + return false; return true; } @Override - public Boolean visit(final BlockStmt n, final Visitable arg) { + public Boolean visit(final BlockStmt n, final Visitable arg) { final BlockStmt n2 = (BlockStmt) arg; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getStatements(), n2.getStatements())) return false; + if (!nodesEquals(n.getStatements(), n2.getStatements())) + return false; return true; } @Override - public Boolean visit(final LabeledStmt n, final Visitable arg) { + public Boolean visit(final LabeledStmt n, final Visitable arg) { final LabeledStmt n2 = (LabeledStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; - if (!nodeEquals(n.getStatement(), n2.getStatement())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; + if (!nodeEquals(n.getStatement(), n2.getStatement())) + return false; return true; } @Override - public Boolean visit(final EmptyStmt n, final Visitable arg) { + public Boolean visit(final EmptyStmt n, final Visitable arg) { return true; } @Override - public Boolean visit(final ExpressionStmt n, final Visitable arg) { + public Boolean visit(final ExpressionStmt n, final Visitable arg) { final ExpressionStmt n2 = (ExpressionStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; return true; } @Override - public Boolean visit(final SwitchStmt n, final Visitable arg) { + public Boolean visit(final SwitchStmt n, final Visitable arg) { final SwitchStmt n2 = (SwitchStmt) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodeEquals(n.getSelector(), n2.getSelector())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodeEquals(n.getSelector(), n2.getSelector())) + return false; return true; } @Override - public Boolean visit(final SwitchEntry n, final Visitable arg) { + public Boolean visit(final SwitchEntry n, final Visitable arg) { final SwitchEntry n2 = (SwitchEntry) arg; - if (!nodeEquals(n.getGuard(), n2.getGuard())) return false; - if (!objEquals(n.isDefault(), n2.isDefault())) return false; - if (!nodesEquals(n.getLabels(), n2.getLabels())) return false; - if (!nodesEquals(n.getStatements(), n2.getStatements())) return false; - if (!objEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getGuard(), n2.getGuard())) + return false; + if (!objEquals(n.isDefault(), n2.isDefault())) + return false; + if (!nodesEquals(n.getLabels(), n2.getLabels())) + return false; + if (!nodesEquals(n.getStatements(), n2.getStatements())) + return false; + if (!objEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final BreakStmt n, final Visitable arg) { + public Boolean visit(final BreakStmt n, final Visitable arg) { final BreakStmt n2 = (BreakStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; return true; } @Override - public Boolean visit(final ReturnStmt n, final Visitable arg) { + public Boolean visit(final ReturnStmt n, final Visitable arg) { final ReturnStmt n2 = (ReturnStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; return true; } @Override - public Boolean visit(final IfStmt n, final Visitable arg) { + public Boolean visit(final IfStmt n, final Visitable arg) { final IfStmt n2 = (IfStmt) arg; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; - if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) return false; - if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; + if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) + return false; + if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) + return false; return true; } @Override - public Boolean visit(final WhileStmt n, final Visitable arg) { + public Boolean visit(final WhileStmt n, final Visitable arg) { final WhileStmt n2 = (WhileStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; return true; } @Override - public Boolean visit(final ContinueStmt n, final Visitable arg) { + public Boolean visit(final ContinueStmt n, final Visitable arg) { final ContinueStmt n2 = (ContinueStmt) arg; - if (!nodeEquals(n.getLabel(), n2.getLabel())) return false; + if (!nodeEquals(n.getLabel(), n2.getLabel())) + return false; return true; } @Override - public Boolean visit(final DoStmt n, final Visitable arg) { + public Boolean visit(final DoStmt n, final Visitable arg) { final DoStmt n2 = (DoStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCondition(), n2.getCondition())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; return true; } @Override - public Boolean visit(final ForEachStmt n, final Visitable arg) { + public Boolean visit(final ForEachStmt n, final Visitable arg) { final ForEachStmt n2 = (ForEachStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodeEquals(n.getIterable(), n2.getIterable())) return false; - if (!nodeEquals(n.getVariable(), n2.getVariable())) return false; + if (!nodeEquals(n.getIterable(), n2.getIterable())) + return false; + if (!nodeEquals(n.getVariable(), n2.getVariable())) + return false; return true; } @Override - public Boolean visit(final ForStmt n, final Visitable arg) { + public Boolean visit(final ForStmt n, final Visitable arg) { final ForStmt n2 = (ForStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getCompare(), n2.getCompare())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getCompare(), n2.getCompare())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!nodesEquals(n.getInitialization(), n2.getInitialization())) return false; - if (!nodesEquals(n.getUpdate(), n2.getUpdate())) return false; + if (!nodesEquals(n.getInitialization(), n2.getInitialization())) + return false; + if (!nodesEquals(n.getUpdate(), n2.getUpdate())) + return false; return true; } @Override - public Boolean visit(final ThrowStmt n, final Visitable arg) { + public Boolean visit(final ThrowStmt n, final Visitable arg) { final ThrowStmt n2 = (ThrowStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; return true; } @Override - public Boolean visit(final SynchronizedStmt n, final Visitable arg) { + public Boolean visit(final SynchronizedStmt n, final Visitable arg) { final SynchronizedStmt n2 = (SynchronizedStmt) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; return true; } @Override - public Boolean visit(final TryStmt n, final Visitable arg) { + public Boolean visit(final TryStmt n, final Visitable arg) { final TryStmt n2 = (TryStmt) arg; - if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) return false; - if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) return false; - if (!nodesEquals(n.getResources(), n2.getResources())) return false; - if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) return false; + if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) + return false; + if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) + return false; + if (!nodesEquals(n.getResources(), n2.getResources())) + return false; + if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) + return false; return true; } @Override - public Boolean visit(final CatchClause n, final Visitable arg) { + public Boolean visit(final CatchClause n, final Visitable arg) { final CatchClause n2 = (CatchClause) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getParameter(), n2.getParameter())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodeEquals(n.getParameter(), n2.getParameter())) + return false; return true; } @Override - public Boolean visit(final LambdaExpr n, final Visitable arg) { + public Boolean visit(final LambdaExpr n, final Visitable arg) { final LambdaExpr n2 = (LambdaExpr) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; if (!nodesEquals(n.getContracts(), n2.getContracts())) return false; - if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; + if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; return true; } @Override - public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { + public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { final MethodReferenceExpr n2 = (MethodReferenceExpr) arg; - if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false; - if (!nodeEquals(n.getScope(), n2.getScope())) return false; - if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false; + if (!objEquals(n.getIdentifier(), n2.getIdentifier())) + return false; + if (!nodeEquals(n.getScope(), n2.getScope())) + return false; + if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) + return false; return true; } @Override - public Boolean visit(final TypeExpr n, final Visitable arg) { + public Boolean visit(final TypeExpr n, final Visitable arg) { final TypeExpr n2 = (TypeExpr) arg; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final ImportDeclaration n, final Visitable arg) { + public Boolean visit(final ImportDeclaration n, final Visitable arg) { final ImportDeclaration n2 = (ImportDeclaration) arg; - if (!objEquals(n.isAsterisk(), n2.isAsterisk())) return false; + if (!objEquals(n.isAsterisk(), n2.isAsterisk())) + return false; if (!objEquals(n.isJmlModel(), n2.isJmlModel())) return false; - if (!objEquals(n.isStatic(), n2.isStatic())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!objEquals(n.isStatic(), n2.isStatic())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(NodeList n, Visitable arg) { + public Boolean visit(NodeList n, Visitable arg) { return nodesEquals((NodeList) n, (NodeList) arg); } @Override - public Boolean visit(final ModuleDeclaration n, final Visitable arg) { + public Boolean visit(final ModuleDeclaration n, final Visitable arg) { final ModuleDeclaration n2 = (ModuleDeclaration) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodesEquals(n.getDirectives(), n2.getDirectives())) return false; - if (!objEquals(n.isOpen(), n2.isOpen())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodesEquals(n.getDirectives(), n2.getDirectives())) + return false; + if (!objEquals(n.isOpen(), n2.isOpen())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { + public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { final ModuleRequiresDirective n2 = (ModuleRequiresDirective) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override() - public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { + public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { final ModuleExportsDirective n2 = (ModuleExportsDirective) arg; - if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override() - public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { + public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { final ModuleProvidesDirective n2 = (ModuleProvidesDirective) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getWith(), n2.getWith())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getWith(), n2.getWith())) + return false; return true; } @Override() - public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { + public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { final ModuleUsesDirective n2 = (ModuleUsesDirective) arg; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { + public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { final ModuleOpensDirective n2 = (ModuleOpensDirective) arg; - if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; + if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; return true; } @Override - public Boolean visit(final UnparsableStmt n, final Visitable arg) { + public Boolean visit(final UnparsableStmt n, final Visitable arg) { return true; } @Override - public Boolean visit(final ReceiverParameter n, final Visitable arg) { + public Boolean visit(final ReceiverParameter n, final Visitable arg) { final ReceiverParameter n2 = (ReceiverParameter) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final VarType n, final Visitable arg) { + public Boolean visit(final VarType n, final Visitable arg) { final VarType n2 = (VarType) arg; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final Modifier n, final Visitable arg) { + public Boolean visit(final Modifier n, final Visitable arg) { final Modifier n2 = (Modifier) arg; - if (!objEquals(n.getKeyword(), n2.getKeyword())) return false; + if (!objEquals(n.getKeyword(), n2.getKeyword())) + return false; return true; } @Override - public Boolean visit(final SwitchExpr n, final Visitable arg) { + public Boolean visit(final SwitchExpr n, final Visitable arg) { final SwitchExpr n2 = (SwitchExpr) arg; - if (!nodesEquals(n.getEntries(), n2.getEntries())) return false; - if (!nodeEquals(n.getSelector(), n2.getSelector())) return false; + if (!nodesEquals(n.getEntries(), n2.getEntries())) + return false; + if (!nodeEquals(n.getSelector(), n2.getSelector())) + return false; return true; } @Override - public Boolean visit(final YieldStmt n, final Visitable arg) { + public Boolean visit(final YieldStmt n, final Visitable arg) { final YieldStmt n2 = (YieldStmt) arg; - if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; + if (!nodeEquals(n.getExpression(), n2.getExpression())) + return false; return true; } @Override - public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { + public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { final TextBlockLiteralExpr n2 = (TextBlockLiteralExpr) arg; - if (!objEquals(n.getValue(), n2.getValue())) return false; + if (!objEquals(n.getValue(), n2.getValue())) + return false; return true; } @Override - public Boolean visit(final TypePatternExpr n, final Visitable arg) { + public Boolean visit(final TypePatternExpr n, final Visitable arg) { final TypePatternExpr n2 = (TypePatternExpr) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final JmlClauseLabel n, final Visitable arg) { + public Boolean visit(final JmlClauseLabel n, final Visitable arg) { final JmlClauseLabel n2 = (JmlClauseLabel) arg; if (!nodeEquals(n.getExpr(), n2.getExpr())) return false; @@ -930,7 +1161,7 @@ public Boolean visit(final JmlClauseLabel n, final Visitable arg) { } @Override - public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { + public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { final JmlExpressionStmt n2 = (JmlExpressionStmt) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -942,7 +1173,7 @@ public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { + public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { final JmlQuantifiedExpr n2 = (JmlQuantifiedExpr) arg; if (!objEquals(n.getBinder(), n2.getBinder())) return false; @@ -954,7 +1185,7 @@ public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlLabelExpr n, final Visitable arg) { + public Boolean visit(final JmlLabelExpr n, final Visitable arg) { final JmlLabelExpr n2 = (JmlLabelExpr) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -966,7 +1197,7 @@ public Boolean visit(final JmlLabelExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlLetExpr n, final Visitable arg) { + public Boolean visit(final JmlLetExpr n, final Visitable arg) { final JmlLetExpr n2 = (JmlLetExpr) arg; if (!nodeEquals(n.getBody(), n2.getBody())) return false; @@ -976,7 +1207,7 @@ public Boolean visit(final JmlLetExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { + public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { final JmlMultiCompareExpr n2 = (JmlMultiCompareExpr) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -986,7 +1217,7 @@ public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { + public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { final JmlSimpleExprClause n2 = (JmlSimpleExprClause) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1000,7 +1231,7 @@ public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlSignalsClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsClause n, final Visitable arg) { final JmlSignalsClause n2 = (JmlSignalsClause) arg; if (!nodeEquals(n.getExpression(), n2.getExpression())) return false; @@ -1012,7 +1243,7 @@ public Boolean visit(final JmlSignalsClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { final JmlSignalsOnlyClause n2 = (JmlSignalsOnlyClause) arg; if (!nodesEquals(n.getTypes(), n2.getTypes())) return false; @@ -1022,7 +1253,7 @@ public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { + public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { final JmlUnreachableStmt n2 = (JmlUnreachableStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1030,7 +1261,7 @@ public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlCallableClause n, final Visitable arg) { + public Boolean visit(final JmlCallableClause n, final Visitable arg) { final JmlCallableClause n2 = (JmlCallableClause) arg; if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures())) return false; @@ -1040,7 +1271,7 @@ public Boolean visit(final JmlCallableClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlForallClause n, final Visitable arg) { + public Boolean visit(final JmlForallClause n, final Visitable arg) { final JmlForallClause n2 = (JmlForallClause) arg; if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables())) return false; @@ -1050,7 +1281,7 @@ public Boolean visit(final JmlForallClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { + public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { final JmlRefiningStmt n2 = (JmlRefiningStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1058,7 +1289,7 @@ public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlClauseIf n, final Visitable arg) { + public Boolean visit(final JmlClauseIf n, final Visitable arg) { final JmlClauseIf n2 = (JmlClauseIf) arg; if (!nodeEquals(n.getCondition(), n2.getCondition())) return false; @@ -1072,7 +1303,7 @@ public Boolean visit(final JmlClauseIf n, final Visitable arg) { } @Override - public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { final JmlClassExprDeclaration n2 = (JmlClassExprDeclaration) arg; if (!nodeEquals(n.getInvariant(), n2.getInvariant())) return false; @@ -1090,7 +1321,7 @@ public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { final JmlClassAccessibleDeclaration n2 = (JmlClassAccessibleDeclaration) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -1108,7 +1339,7 @@ public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) } @Override - public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { + public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { final JmlRepresentsDeclaration n2 = (JmlRepresentsDeclaration) arg; if (!nodeEquals(n.getExpr(), n2.getExpr())) return false; @@ -1124,7 +1355,7 @@ public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlContract n, final Visitable arg) { + public Boolean visit(final JmlContract n, final Visitable arg) { final JmlContract n2 = (JmlContract) arg; if (!objEquals(n.getBehavior(), n2.getBehavior())) return false; @@ -1144,7 +1375,7 @@ public Boolean visit(final JmlContract n, final Visitable arg) { } @Override - public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { + public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { final JmlSetComprehensionExpr n2 = (JmlSetComprehensionExpr) arg; if (!nodeEquals(n.getBinding(), n2.getBinding())) return false; @@ -1154,7 +1385,7 @@ public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlGhostStmt n, final Visitable arg) { + public Boolean visit(final JmlGhostStmt n, final Visitable arg) { final JmlGhostStmt n2 = (JmlGhostStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1164,42 +1395,59 @@ public Boolean visit(final JmlGhostStmt n, final Visitable arg) { } @Override - public Boolean visit(final RecordDeclaration n, final Visitable arg) { + public Boolean visit(final RecordDeclaration n, final Visitable arg) { final RecordDeclaration n2 = (RecordDeclaration) arg; - if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false; - if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getMembers(), n2.getMembers())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) + return false; + if (!nodesEquals(n.getParameters(), n2.getParameters())) + return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getMembers(), n2.getMembers())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { final CompactConstructorDeclaration n2 = (CompactConstructorDeclaration) arg; - if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodeEquals(n.getName(), n2.getName())) return false; - if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; - if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false; - if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false; + if (!nodeEquals(n.getBody(), n2.getBody())) + return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodeEquals(n.getName(), n2.getName())) + return false; + if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) + return false; + if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) + return false; + if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) + return false; return true; } @Override - public Boolean visit(final RecordPatternExpr n, final Visitable arg) { + public Boolean visit(final RecordPatternExpr n, final Visitable arg) { final RecordPatternExpr n2 = (RecordPatternExpr) arg; - if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false; - if (!nodesEquals(n.getPatternList(), n2.getPatternList())) return false; - if (!nodeEquals(n.getType(), n2.getType())) return false; + if (!nodesEquals(n.getModifiers(), n2.getModifiers())) + return false; + if (!nodesEquals(n.getPatternList(), n2.getPatternList())) + return false; + if (!nodeEquals(n.getType(), n2.getType())) + return false; return true; } @Override - public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { + public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { final JmlMethodDeclaration n2 = (JmlMethodDeclaration) arg; if (!nodeEquals(n.getContract(), n2.getContract())) return false; @@ -1213,7 +1461,7 @@ public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { + public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { final JmlBinaryInfixExpr n2 = (JmlBinaryInfixExpr) arg; if (!nodeEquals(n.getLeft(), n2.getLeft())) return false; @@ -1225,7 +1473,7 @@ public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { + public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { final JmlDocDeclaration n2 = (JmlDocDeclaration) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1235,7 +1483,7 @@ public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocStmt n, final Visitable arg) { + public Boolean visit(final JmlDocStmt n, final Visitable arg) { final JmlDocStmt n2 = (JmlDocStmt) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1243,7 +1491,7 @@ public Boolean visit(final JmlDocStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlDoc n, final Visitable arg) { + public Boolean visit(final JmlDoc n, final Visitable arg) { final JmlDoc n2 = (JmlDoc) arg; if (!objEquals(n.getContent(), n2.getContent())) return false; @@ -1251,7 +1499,7 @@ public Boolean visit(final JmlDoc n, final Visitable arg) { } @Override - public Boolean visit(final JmlDocType n, final Visitable arg) { + public Boolean visit(final JmlDocType n, final Visitable arg) { final JmlDocType n2 = (JmlDocType) arg; if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false; @@ -1267,7 +1515,7 @@ public Boolean visit(final JmlDocType n, final Visitable arg) { } @Override - public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { + public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { final JmlFieldDeclaration n2 = (JmlFieldDeclaration) arg; if (!nodeEquals(n.getDecl(), n2.getDecl())) return false; @@ -1279,7 +1527,7 @@ public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { } @Override - public Boolean visit(final JmlOldClause n, final Visitable arg) { + public Boolean visit(final JmlOldClause n, final Visitable arg) { final JmlOldClause n2 = (JmlOldClause) arg; if (!nodeEquals(n.getDeclarations(), n2.getDeclarations())) return false; @@ -1289,7 +1537,7 @@ public Boolean visit(final JmlOldClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlTypeExpr n, final Visitable arg) { + public Boolean visit(final JmlTypeExpr n, final Visitable arg) { final JmlTypeExpr n2 = (JmlTypeExpr) arg; if (!nodeEquals(n.getType(), n2.getType())) return false; @@ -1297,7 +1545,7 @@ public Boolean visit(final JmlTypeExpr n, final Visitable arg) { } @Override - public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { + public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { final JmlMultiExprClause n2 = (JmlMultiExprClause) arg; if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false; @@ -1311,7 +1559,7 @@ public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { } @Override - public Boolean visit(final JmlBeginStmt n, final Visitable arg) { + public Boolean visit(final JmlBeginStmt n, final Visitable arg) { final JmlBeginStmt n2 = (JmlBeginStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1319,7 +1567,7 @@ public Boolean visit(final JmlBeginStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlEndStmt n, final Visitable arg) { + public Boolean visit(final JmlEndStmt n, final Visitable arg) { final JmlEndStmt n2 = (JmlEndStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1327,7 +1575,7 @@ public Boolean visit(final JmlEndStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlLabelStmt n, final Visitable arg) { + public Boolean visit(final JmlLabelStmt n, final Visitable arg) { final JmlLabelStmt n2 = (JmlLabelStmt) arg; if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false; @@ -1337,7 +1585,7 @@ public Boolean visit(final JmlLabelStmt n, final Visitable arg) { } @Override - public Boolean visit(final JmlMethodSignature n, final Visitable arg) { + public Boolean visit(final JmlMethodSignature n, final Visitable arg) { final JmlMethodSignature n2 = (JmlMethodSignature) arg; if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes())) return false; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java index 163f3d167e..c48f311857 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java @@ -29,8 +29,13 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; -public class NoCommentHashCodeVisitor implements GenericVisitor { +public class NoCommentHashCodeVisitor implements GenericVisitor { private static final NoCommentHashCodeVisitor SINGLETON = new NoCommentHashCodeVisitor(); @@ -38,325 +43,232 @@ public static int hashCode(final Node node) { return node.accept(SINGLETON, null); } - public Integer visit(final AnnotationDeclaration n, final Void arg) { - return (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final AnnotationDeclaration n, final Void arg) { + return (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { - return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { + return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final ArrayAccessExpr n, final Void arg) { + public Integer visit(final ArrayAccessExpr n, final Void arg) { return (n.getIndex().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final ArrayCreationExpr n, final Void arg) { - return (n.getElementType().accept(this, arg)) * 31 - + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 - + (n.getLevels().accept(this, arg)); + public Integer visit(final ArrayCreationExpr n, final Void arg) { + return (n.getElementType().accept(this, arg)) * 31 + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getLevels().accept(this, arg)); } - public Integer visit(final ArrayCreationLevel n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0); + public Integer visit(final ArrayCreationLevel n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0); } - public Integer visit(final ArrayInitializerExpr n, final Void arg) { + public Integer visit(final ArrayInitializerExpr n, final Void arg) { return (n.getValues().accept(this, arg)); } - public Integer visit(final ArrayType n, final Void arg) { - return (n.getComponentType().accept(this, arg)) * 31 - + (n.getOrigin().hashCode()) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final ArrayType n, final Void arg) { + return (n.getComponentType().accept(this, arg)) * 31 + (n.getOrigin().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final AssertStmt n, final Void arg) { - return (n.getCheck().accept(this, arg)) * 31 - + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0); + public Integer visit(final AssertStmt n, final Void arg) { + return (n.getCheck().accept(this, arg)) * 31 + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0); } - public Integer visit(final AssignExpr n, final Void arg) { - return (n.getOperator().hashCode()) * 31 - + (n.getTarget().accept(this, arg)) * 31 - + (n.getValue().accept(this, arg)); + public Integer visit(final AssignExpr n, final Void arg) { + return (n.getOperator().hashCode()) * 31 + (n.getTarget().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)); } - public Integer visit(final BinaryExpr n, final Void arg) { - return (n.getLeft().accept(this, arg)) * 31 - + (n.getOperator().hashCode()) * 31 - + (n.getRight().accept(this, arg)); + public Integer visit(final BinaryExpr n, final Void arg) { + return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getRight().accept(this, arg)); } - public Integer visit(final BlockComment n, final Void arg) { + public Integer visit(final BlockComment n, final Void arg) { return 0; } - public Integer visit(final BlockStmt n, final Void arg) { + public Integer visit(final BlockStmt n, final Void arg) { return (n.getContracts().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)); } - public Integer visit(final BooleanLiteralExpr n, final Void arg) { + public Integer visit(final BooleanLiteralExpr n, final Void arg) { return (n.isValue() ? 1 : 0); } - public Integer visit(final BreakStmt n, final Void arg) { + public Integer visit(final BreakStmt n, final Void arg) { return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0); } - public Integer visit(final CastExpr n, final Void arg) { + public Integer visit(final CastExpr n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getType().accept(this, arg)); } - public Integer visit(final CatchClause n, final Void arg) { + public Integer visit(final CatchClause n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)); } - public Integer visit(final CharLiteralExpr n, final Void arg) { + public Integer visit(final CharLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } - public Integer visit(final ClassExpr n, final Void arg) { + public Integer visit(final ClassExpr n, final Void arg) { return (n.getType().accept(this, arg)); } - public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { - return (n.getExtendedTypes().accept(this, arg)) * 31 - + (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.isInterface() ? 1 : 0) * 31 - + (n.getPermittedTypes().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); - } - - public Integer visit(final ClassOrInterfaceType n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 - + (n.getAnnotations().accept(this, arg)); - } - - public Integer visit(final CompilationUnit n, final Void arg) { - return (n.getImports().accept(this, arg)) * 31 - + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 - + (n.getPackageDeclaration().isPresent() - ? n.getPackageDeclaration().get().accept(this, arg) - : 0) - * 31 - + (n.getTypes().accept(this, arg)); - } - - public Integer visit(final ConditionalExpr n, final Void arg) { - return (n.getCondition().accept(this, arg)) * 31 - + (n.getElseExpr().accept(this, arg)) * 31 - + (n.getThenExpr().accept(this, arg)); - } - - public Integer visit(final ConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); - } - - public Integer visit(final ContinueStmt n, final Void arg) { + public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { + return (n.getExtendedTypes().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.isInterface() ? 1 : 0) * 31 + (n.getPermittedTypes().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); + } + + public Integer visit(final ClassOrInterfaceType n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)); + } + + public Integer visit(final CompilationUnit n, final Void arg) { + return (n.getImports().accept(this, arg)) * 31 + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 + (n.getPackageDeclaration().isPresent() ? n.getPackageDeclaration().get().accept(this, arg) : 0) * 31 + (n.getTypes().accept(this, arg)); + } + + public Integer visit(final ConditionalExpr n, final Void arg) { + return (n.getCondition().accept(this, arg)) * 31 + (n.getElseExpr().accept(this, arg)) * 31 + (n.getThenExpr().accept(this, arg)); + } + + public Integer visit(final ConstructorDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); + } + + public Integer visit(final ContinueStmt n, final Void arg) { return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0); } - public Integer visit(final DoStmt n, final Void arg) { + public Integer visit(final DoStmt n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)); } - public Integer visit(final DoubleLiteralExpr n, final Void arg) { + public Integer visit(final DoubleLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } - public Integer visit(final EmptyStmt n, final Void arg) { + public Integer visit(final EmptyStmt n, final Void arg) { return 0; } - public Integer visit(final EnclosedExpr n, final Void arg) { + public Integer visit(final EnclosedExpr n, final Void arg) { return (n.getInner().accept(this, arg)); } - public Integer visit(final EnumConstantDeclaration n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getClassBody().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final EnumConstantDeclaration n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getClassBody().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final EnumDeclaration n, final Void arg) { - return (n.getEntries().accept(this, arg)) * 31 - + (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final EnumDeclaration n, final Void arg) { + return (n.getEntries().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 - + (n.isThis() ? 1 : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); + public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.isThis() ? 1 : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); } - public Integer visit(final ExpressionStmt n, final Void arg) { + public Integer visit(final ExpressionStmt n, final Void arg) { return (n.getExpression().accept(this, arg)); } - public Integer visit(final FieldAccessExpr n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getScope().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); + public Integer visit(final FieldAccessExpr n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); } - public Integer visit(final FieldDeclaration n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getVariables().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final FieldDeclaration n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final ForStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 - + (n.getUpdate().accept(this, arg)); + public Integer visit(final ForStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 + (n.getUpdate().accept(this, arg)); } - public Integer visit(final ForEachStmt n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 - + (n.getVariable().accept(this, arg)); + public Integer visit(final ForEachStmt n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)); } - public Integer visit(final IfStmt n, final Void arg) { - return (n.getCondition().accept(this, arg)) * 31 - + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 - + (n.getThenStmt().accept(this, arg)); + public Integer visit(final IfStmt n, final Void arg) { + return (n.getCondition().accept(this, arg)) * 31 + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 + (n.getThenStmt().accept(this, arg)); } - public Integer visit(final ImportDeclaration n, final Void arg) { - return (n.isAsterisk() ? 1 : 0) * 31 - + (n.isJmlModel() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 - + (n.getName().accept(this, arg)); + public Integer visit(final ImportDeclaration n, final Void arg) { + return (n.isAsterisk() ? 1 : 0) * 31 + (n.isJmlModel() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final InitializerDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.isStatic() ? 1 : 0) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final InitializerDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final InstanceOfExpr n, final Void arg) { - return (n.getExpression().accept(this, arg)) * 31 - + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)); + public Integer visit(final InstanceOfExpr n, final Void arg) { + return (n.getExpression().accept(this, arg)) * 31 + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)); } - public Integer visit(final IntegerLiteralExpr n, final Void arg) { + public Integer visit(final IntegerLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } - public Integer visit(final IntersectionType n, final Void arg) { + public Integer visit(final IntersectionType n, final Void arg) { return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final JavadocComment n, final Void arg) { + public Integer visit(final JavadocComment n, final Void arg) { return 0; } - public Integer visit(final LabeledStmt n, final Void arg) { + public Integer visit(final LabeledStmt n, final Void arg) { return (n.getLabel().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)); } - public Integer visit(final LambdaExpr n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 - + (n.getParameters().accept(this, arg)); + public Integer visit(final LambdaExpr n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 + (n.getParameters().accept(this, arg)); } - public Integer visit(final LineComment n, final Void arg) { + public Integer visit(final LineComment n, final Void arg) { return 0; } - public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { + public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { return (n.getClassDeclaration().accept(this, arg)); } @Override - public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { + public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { return (n.getRecordDeclaration().accept(this, arg)); } - public Integer visit(final LongLiteralExpr n, final Void arg) { + public Integer visit(final LongLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } - public Integer visit(final MarkerAnnotationExpr n, final Void arg) { + public Integer visit(final MarkerAnnotationExpr n, final Void arg) { return (n.getName().accept(this, arg)); } - public Integer visit(final MemberValuePair n, final Void arg) { + public Integer visit(final MemberValuePair n, final Void arg) { return (n.getName().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)); } - public Integer visit(final MethodCallExpr n, final Void arg) { - return (n.getArguments().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); + public Integer visit(final MethodCallExpr n, final Void arg) { + return (n.getArguments().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); } - public Integer visit(final MethodDeclaration n, final Void arg) { - return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final MethodDeclaration n, final Void arg) { + return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final MethodReferenceExpr n, final Void arg) { - return (n.getIdentifier().hashCode()) * 31 - + (n.getScope().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); + public Integer visit(final MethodReferenceExpr n, final Void arg) { + return (n.getIdentifier().hashCode()) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); } - public Integer visit(final NameExpr n, final Void arg) { + public Integer visit(final NameExpr n, final Void arg) { return (n.getName().accept(this, arg)); } - public Integer visit(final Name n, final Void arg) { - return (n.getIdentifier().hashCode()) * 31 - + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0); + public Integer visit(final Name n, final Void arg) { + return (n.getIdentifier().hashCode()) * 31 + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0); } - public Integer visit(NodeList n, Void arg) { + public Integer visit(NodeList n, Void arg) { int result = 0; for (Object node : n) { result += 31 * ((Visitable) node).accept(this, arg); @@ -364,414 +276,363 @@ public Integer visit(NodeList n, Void arg) { return result; } - public Integer visit(final NormalAnnotationExpr n, final Void arg) { + public Integer visit(final NormalAnnotationExpr n, final Void arg) { return (n.getPairs().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final NullLiteralExpr n, final Void arg) { + public Integer visit(final NullLiteralExpr n, final Void arg) { return 0; } - public Integer visit(final ObjectCreationExpr n, final Void arg) { - return (n.getAnonymousClassBody().isPresent() - ? n.getAnonymousClassBody().get().accept(this, arg) - : 0) - * 31 - + (n.getArguments().accept(this, arg)) * 31 - + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); + public Integer visit(final ObjectCreationExpr n, final Void arg) { + return (n.getAnonymousClassBody().isPresent() ? n.getAnonymousClassBody().get().accept(this, arg) : 0) * 31 + (n.getArguments().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0); } - public Integer visit(final PackageDeclaration n, final Void arg) { + public Integer visit(final PackageDeclaration n, final Void arg) { return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final Parameter n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.isVarArgs() ? 1 : 0) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)) * 31 - + (n.getVarArgsAnnotations().accept(this, arg)); + public Integer visit(final Parameter n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.isVarArgs() ? 1 : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getVarArgsAnnotations().accept(this, arg)); } - public Integer visit(final PrimitiveType n, final Void arg) { + public Integer visit(final PrimitiveType n, final Void arg) { return (n.getType().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final ReturnStmt n, final Void arg) { + public Integer visit(final ReturnStmt n, final Void arg) { return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0); } - public Integer visit(final SimpleName n, final Void arg) { + public Integer visit(final SimpleName n, final Void arg) { return (n.getIdentifier().hashCode()); } - public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { + public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { return (n.getMemberValue().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final StringLiteralExpr n, final Void arg) { + public Integer visit(final StringLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } - public Integer visit(final SuperExpr n, final Void arg) { + public Integer visit(final SuperExpr n, final Void arg) { return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0); } - public Integer visit(final SwitchEntry n, final Void arg) { - return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 - + (n.isDefault() ? 1 : 0) * 31 - + (n.getLabels().accept(this, arg)) * 31 - + (n.getStatements().accept(this, arg)) * 31 - + (n.getType().hashCode()); + public Integer visit(final SwitchEntry n, final Void arg) { + return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 + (n.isDefault() ? 1 : 0) * 31 + (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()); } - public Integer visit(final SwitchStmt n, final Void arg) { + public Integer visit(final SwitchStmt n, final Void arg) { return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)); } - public Integer visit(final SynchronizedStmt n, final Void arg) { + public Integer visit(final SynchronizedStmt n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)); } - public Integer visit(final ThisExpr n, final Void arg) { + public Integer visit(final ThisExpr n, final Void arg) { return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0); } - public Integer visit(final ThrowStmt n, final Void arg) { + public Integer visit(final ThrowStmt n, final Void arg) { return (n.getExpression().accept(this, arg)); } - public Integer visit(final TryStmt n, final Void arg) { - return (n.getCatchClauses().accept(this, arg)) * 31 - + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 - + (n.getResources().accept(this, arg)) * 31 - + (n.getTryBlock().accept(this, arg)); + public Integer visit(final TryStmt n, final Void arg) { + return (n.getCatchClauses().accept(this, arg)) * 31 + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 + (n.getResources().accept(this, arg)) * 31 + (n.getTryBlock().accept(this, arg)); } - public Integer visit(final TypeExpr n, final Void arg) { + public Integer visit(final TypeExpr n, final Void arg) { return (n.getType().accept(this, arg)); } - public Integer visit(final TypeParameter n, final Void arg) { - return (n.getName().accept(this, arg)) * 31 - + (n.getTypeBound().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final TypeParameter n, final Void arg) { + return (n.getName().accept(this, arg)) * 31 + (n.getTypeBound().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final UnaryExpr n, final Void arg) { + public Integer visit(final UnaryExpr n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getOperator().hashCode()); } - public Integer visit(final UnionType n, final Void arg) { + public Integer visit(final UnionType n, final Void arg) { return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final UnknownType n, final Void arg) { + public Integer visit(final UnknownType n, final Void arg) { return (n.getAnnotations().accept(this, arg)); } - public Integer visit(final VariableDeclarationExpr n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getVariables().accept(this, arg)); + public Integer visit(final VariableDeclarationExpr n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)); } - public Integer visit(final VariableDeclarator n, final Void arg) { - return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)); + public Integer visit(final VariableDeclarator n, final Void arg) { + return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)); } - public Integer visit(final VoidType n, final Void arg) { + public Integer visit(final VoidType n, final Void arg) { return (n.getAnnotations().accept(this, arg)); } - public Integer visit(final WhileStmt n, final Void arg) { + public Integer visit(final WhileStmt n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)); } - public Integer visit(final WildcardType n, final Void arg) { - return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 - + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final WildcardType n, final Void arg) { + return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final ModuleDeclaration n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getDirectives().accept(this, arg)) * 31 - + (n.isOpen() ? 1 : 0) * 31 - + (n.getName().accept(this, arg)); + public Integer visit(final ModuleDeclaration n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDirectives().accept(this, arg)) * 31 + (n.isOpen() ? 1 : 0) * 31 + (n.getName().accept(this, arg)); } - public Integer visit(final ModuleRequiresDirective n, final Void arg) { + public Integer visit(final ModuleRequiresDirective n, final Void arg) { return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } @Override() - public Integer visit(final ModuleExportsDirective n, final Void arg) { + public Integer visit(final ModuleExportsDirective n, final Void arg) { return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } @Override() - public Integer visit(final ModuleProvidesDirective n, final Void arg) { + public Integer visit(final ModuleProvidesDirective n, final Void arg) { return (n.getName().accept(this, arg)) * 31 + (n.getWith().accept(this, arg)); } @Override() - public Integer visit(final ModuleUsesDirective n, final Void arg) { + public Integer visit(final ModuleUsesDirective n, final Void arg) { return (n.getName().accept(this, arg)); } @Override - public Integer visit(final ModuleOpensDirective n, final Void arg) { + public Integer visit(final ModuleOpensDirective n, final Void arg) { return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)); } @Override - public Integer visit(final UnparsableStmt n, final Void arg) { + public Integer visit(final UnparsableStmt n, final Void arg) { return 0; } @Override - public Integer visit(final ReceiverParameter n, final Void arg) { - return (n.getAnnotations().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)); + public Integer visit(final ReceiverParameter n, final Void arg) { + return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)); } @Override - public Integer visit(final VarType n, final Void arg) { + public Integer visit(final VarType n, final Void arg) { return (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final Modifier n, final Void arg) { + public Integer visit(final Modifier n, final Void arg) { return (n.getKeyword().hashCode()); } @Override - public Integer visit(final SwitchExpr n, final Void arg) { + public Integer visit(final SwitchExpr n, final Void arg) { return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)); } @Override - public Integer visit(final YieldStmt n, final Void arg) { + public Integer visit(final YieldStmt n, final Void arg) { return (n.getExpression().accept(this, arg)); } @Override - public Integer visit(final TextBlockLiteralExpr n, final Void arg) { + public Integer visit(final TextBlockLiteralExpr n, final Void arg) { return (n.getValue().hashCode()); } @Override - public Integer visit(final TypePatternExpr n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)); + public Integer visit(final TypePatternExpr n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)); } @Override - public Integer visit(final JmlQuantifiedExpr n, final Void arg) { + public Integer visit(final JmlQuantifiedExpr n, final Void arg) { return (n.getBinder().hashCode()) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)); } @Override - public Integer visit(final JmlClauseLabel n, final Void arg) { + public Integer visit(final JmlClauseLabel n, final Void arg) { return (n.getExpr().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlExpressionStmt n, final Void arg) { + public Integer visit(final JmlExpressionStmt n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().hashCode()); } @Override - public Integer visit(final JmlLabelExpr n, final Void arg) { + public Integer visit(final JmlLabelExpr n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().accept(this, arg)); } @Override - public Integer visit(final JmlLetExpr n, final Void arg) { + public Integer visit(final JmlLetExpr n, final Void arg) { return (n.getBody().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)); } @Override - public Integer visit(final JmlMultiCompareExpr n, final Void arg) { + public Integer visit(final JmlMultiCompareExpr n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getOperators().hashCode()); } @Override - public Integer visit(final JmlSimpleExprClause n, final Void arg) { + public Integer visit(final JmlSimpleExprClause n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSignalsClause n, final Void arg) { + public Integer visit(final JmlSignalsClause n, final Void arg) { return (n.getExpression().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { + public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { return (n.getTypes().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlUnreachableStmt n, final Void arg) { + public Integer visit(final JmlUnreachableStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)); } @Override - public Integer visit(final JmlCallableClause n, final Void arg) { + public Integer visit(final JmlCallableClause n, final Void arg) { return (n.getMethodSignatures().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlForallClause n, final Void arg) { + public Integer visit(final JmlForallClause n, final Void arg) { return (n.getBoundedVariables().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlRefiningStmt n, final Void arg) { + public Integer visit(final JmlRefiningStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)); } @Override - public Integer visit(final JmlClauseIf n, final Void arg) { + public Integer visit(final JmlClauseIf n, final Void arg) { return (n.getCondition().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getThen().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlClassExprDeclaration n, final Void arg) { + public Integer visit(final JmlClassExprDeclaration n, final Void arg) { return (n.getInvariant().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { + public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { + public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { return (n.getExpr().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlContract n, final Void arg) { + public Integer visit(final JmlContract n, final Void arg) { return (n.getBehavior().hashCode()) * 31 + (n.getClauses().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSubContracts().accept(this, arg)) * 31 + (n.getType().hashCode()); } @Override - public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { + public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { return (n.getBinding().accept(this, arg)) * 31 + (n.getPredicate().accept(this, arg)); } @Override - public Integer visit(final JmlGhostStmt n, final Void arg) { + public Integer visit(final JmlGhostStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)); } @Override - public Integer visit(final RecordDeclaration n, final Void arg) { - return (n.getImplementedTypes().accept(this, arg)) * 31 - + (n.getParameters().accept(this, arg)) * 31 - + (n.getReceiverParameter().isPresent() - ? n.getReceiverParameter().get().accept(this, arg) - : 0) - * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getMembers().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final RecordDeclaration n, final Void arg) { + return (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } - public Integer visit(final CompactConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 - + (n.getModifiers().accept(this, arg)) * 31 - + (n.getName().accept(this, arg)) * 31 - + (n.getThrownExceptions().accept(this, arg)) * 31 - + (n.getTypeParameters().accept(this, arg)) * 31 - + (n.getAnnotations().accept(this, arg)); + public Integer visit(final CompactConstructorDeclaration n, final Void arg) { + return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final RecordPatternExpr n, final Void arg) { - return (n.getModifiers().accept(this, arg)) * 31 - + (n.getPatternList().accept(this, arg)) * 31 - + (n.getType().accept(this, arg)); + public Integer visit(final RecordPatternExpr n, final Void arg) { + return (n.getModifiers().accept(this, arg)) * 31 + (n.getPatternList().accept(this, arg)) * 31 + (n.getType().accept(this, arg)); } @Override - public Integer visit(final JmlMethodDeclaration n, final Void arg) { + public Integer visit(final JmlMethodDeclaration n, final Void arg) { return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMethodDeclaration().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { + public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().accept(this, arg)) * 31 + (n.getRight().accept(this, arg)); } @Override - public Integer visit(final JmlDocDeclaration n, final Void arg) { + public Integer visit(final JmlDocDeclaration n, final Void arg) { return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlDocStmt n, final Void arg) { + public Integer visit(final JmlDocStmt n, final Void arg) { return (n.getJmlComments().accept(this, arg)); } @Override - public Integer visit(final JmlDoc n, final Void arg) { + public Integer visit(final JmlDoc n, final Void arg) { return (n.getContent().hashCode()); } @Override - public Integer visit(final JmlDocType n, final Void arg) { + public Integer visit(final JmlDocType n, final Void arg) { return (n.getJmlComments().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlFieldDeclaration n, final Void arg) { + public Integer visit(final JmlFieldDeclaration n, final Void arg) { return (n.getDecl().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Override - public Integer visit(final JmlOldClause n, final Void arg) { + public Integer visit(final JmlOldClause n, final Void arg) { return (n.getDeclarations().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlTypeExpr n, final Void arg) { + public Integer visit(final JmlTypeExpr n, final Void arg) { return (n.getType().accept(this, arg)); } @Override - public Integer visit(final JmlMultiExprClause n, final Void arg) { + public Integer visit(final JmlMultiExprClause n, final Void arg) { return (n.getExpressions().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0); } @Override - public Integer visit(final JmlBeginStmt n, final Void arg) { + public Integer visit(final JmlBeginStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)); } @Override - public Integer visit(final JmlEndStmt n, final Void arg) { + public Integer visit(final JmlEndStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)); } @Override - public Integer visit(final JmlLabelStmt n, final Void arg) { + public Integer visit(final JmlLabelStmt n, final Void arg) { return (n.getJmlTags().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)); } @Override - public Integer visit(final JmlMethodSignature n, final Void arg) { + public Integer visit(final JmlMethodSignature n, final Void arg) { return (n.getArgumentTypes().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java index fc7357c962..750720f67e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java @@ -20,7 +20,6 @@ package com.github.javaparser.ast.visitor; import java.util.function.BiFunction; - import com.github.javaparser.Range; import com.github.javaparser.ast.ArrayCreationLevel; import com.github.javaparser.ast.CompilationUnit; @@ -46,43 +45,7 @@ import com.github.javaparser.ast.comments.BlockComment; import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; -import com.github.javaparser.ast.expr.ArrayAccessExpr; -import com.github.javaparser.ast.expr.ArrayCreationExpr; -import com.github.javaparser.ast.expr.ArrayInitializerExpr; -import com.github.javaparser.ast.expr.AssignExpr; -import com.github.javaparser.ast.expr.BinaryExpr; -import com.github.javaparser.ast.expr.BooleanLiteralExpr; -import com.github.javaparser.ast.expr.CastExpr; -import com.github.javaparser.ast.expr.CharLiteralExpr; -import com.github.javaparser.ast.expr.ClassExpr; -import com.github.javaparser.ast.expr.ConditionalExpr; -import com.github.javaparser.ast.expr.DoubleLiteralExpr; -import com.github.javaparser.ast.expr.EnclosedExpr; -import com.github.javaparser.ast.expr.FieldAccessExpr; -import com.github.javaparser.ast.expr.InstanceOfExpr; -import com.github.javaparser.ast.expr.IntegerLiteralExpr; -import com.github.javaparser.ast.expr.LambdaExpr; -import com.github.javaparser.ast.expr.LongLiteralExpr; -import com.github.javaparser.ast.expr.MarkerAnnotationExpr; -import com.github.javaparser.ast.expr.MemberValuePair; -import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.MethodReferenceExpr; -import com.github.javaparser.ast.expr.Name; -import com.github.javaparser.ast.expr.NameExpr; -import com.github.javaparser.ast.expr.NormalAnnotationExpr; -import com.github.javaparser.ast.expr.NullLiteralExpr; -import com.github.javaparser.ast.expr.ObjectCreationExpr; -import com.github.javaparser.ast.expr.PatternExpr; -import com.github.javaparser.ast.expr.SimpleName; -import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr; -import com.github.javaparser.ast.expr.StringLiteralExpr; -import com.github.javaparser.ast.expr.SuperExpr; -import com.github.javaparser.ast.expr.SwitchExpr; -import com.github.javaparser.ast.expr.TextBlockLiteralExpr; -import com.github.javaparser.ast.expr.ThisExpr; -import com.github.javaparser.ast.expr.TypeExpr; -import com.github.javaparser.ast.expr.UnaryExpr; -import com.github.javaparser.ast.expr.VariableDeclarationExpr; +import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.modules.ModuleDeclaration; import com.github.javaparser.ast.modules.ModuleExportsDirective; import com.github.javaparser.ast.modules.ModuleOpensDirective; @@ -123,12 +86,22 @@ import com.github.javaparser.ast.type.VarType; import com.github.javaparser.ast.type.VoidType; import com.github.javaparser.ast.type.WildcardType; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /* * A visitor who applies a function (based on a range) on each node of the AST and retains the node selected by the function. * An example usage might be to find the node that encompasses a range (the covering node). */ -public class NodeFinderVisitor extends VoidVisitorAdapter { +public class NodeFinderVisitor extends VoidVisitorAdapter { public static BiFunction fConveringNode = (Node n, Range range) -> { return n.hasRange() && n.getRange().get().contains(range); @@ -142,7 +115,7 @@ public class NodeFinderVisitor extends VoidVisitorAdapter { */ private static BiFunction fn; - public NodeFinderVisitor(BiFunction fn) { + public NodeFinderVisitor(BiFunction fn) { this.fn = fn; } @@ -153,31 +126,36 @@ public NodeFinderVisitor(BiFunction fn) { * * @return Node */ - public Node getSelectedNode() { + public Node getSelectedNode() { return selectedNode; } @Override - public void visit(final AnnotationDeclaration n, final Range arg) { + public void visit(final AnnotationDeclaration n, final Range arg) { { n.getMembers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -186,30 +164,36 @@ public void visit(final AnnotationDeclaration n, final Range arg) { } @Override - public void visit(final AnnotationMemberDeclaration n, final Range arg) { + public void visit(final AnnotationMemberDeclaration n, final Range arg) { if (n.getDefaultValue().isPresent()) { n.getDefaultValue().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -218,18 +202,21 @@ public void visit(final AnnotationMemberDeclaration n, final Range arg) { } @Override - public void visit(final ArrayAccessExpr n, final Range arg) { + public void visit(final ArrayAccessExpr n, final Range arg) { { n.getIndex().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -238,22 +225,26 @@ public void visit(final ArrayAccessExpr n, final Range arg) { } @Override - public void visit(final ArrayCreationExpr n, final Range arg) { + public void visit(final ArrayCreationExpr n, final Range arg) { { n.getElementType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getInitializer().isPresent()) { n.getInitializer().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getLevels().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -262,14 +253,16 @@ public void visit(final ArrayCreationExpr n, final Range arg) { } @Override - public void visit(final ArrayInitializerExpr n, final Range arg) { + public void visit(final ArrayInitializerExpr n, final Range arg) { { n.getValues().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -278,18 +271,21 @@ public void visit(final ArrayInitializerExpr n, final Range arg) { } @Override - public void visit(final AssertStmt n, final Range arg) { + public void visit(final AssertStmt n, final Range arg) { { n.getCheck().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getMessage().isPresent()) { n.getMessage().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -298,18 +294,21 @@ public void visit(final AssertStmt n, final Range arg) { } @Override - public void visit(final AssignExpr n, final Range arg) { + public void visit(final AssignExpr n, final Range arg) { { n.getTarget().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getValue().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -318,18 +317,21 @@ public void visit(final AssignExpr n, final Range arg) { } @Override - public void visit(final BinaryExpr n, final Range arg) { + public void visit(final BinaryExpr n, final Range arg) { { n.getLeft().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getRight().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -338,14 +340,16 @@ public void visit(final BinaryExpr n, final Range arg) { } @Override - public void visit(final BlockStmt n, final Range arg) { + public void visit(final BlockStmt n, final Range arg) { { n.getStatements().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -354,10 +358,11 @@ public void visit(final BlockStmt n, final Range arg) { } @Override - public void visit(final BooleanLiteralExpr n, final Range arg) { + public void visit(final BooleanLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -366,14 +371,16 @@ public void visit(final BooleanLiteralExpr n, final Range arg) { } @Override - public void visit(final BreakStmt n, final Range arg) { + public void visit(final BreakStmt n, final Range arg) { if (n.getLabel().isPresent()) { n.getLabel().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -382,18 +389,21 @@ public void visit(final BreakStmt n, final Range arg) { } @Override - public void visit(final CastExpr n, final Range arg) { + public void visit(final CastExpr n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -402,18 +412,21 @@ public void visit(final CastExpr n, final Range arg) { } @Override - public void visit(final CatchClause n, final Range arg) { + public void visit(final CatchClause n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getParameter().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -422,23 +435,26 @@ public void visit(final CatchClause n, final Range arg) { } @Override - public void visit(final CharLiteralExpr n, final Range arg) { + public void visit(final CharLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } return; } @Override - public void visit(final ClassExpr n, final Range arg) { + public void visit(final ClassExpr n, final Range arg) { { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -447,42 +463,51 @@ public void visit(final ClassExpr n, final Range arg) { } @Override - public void visit(final ClassOrInterfaceDeclaration n, final Range arg) { + public void visit(final ClassOrInterfaceDeclaration n, final Range arg) { { n.getExtendedTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getImplementedTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getPermittedTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getMembers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -491,26 +516,31 @@ public void visit(final ClassOrInterfaceDeclaration n, final Range arg) { } @Override - public void visit(final ClassOrInterfaceType n, final Range arg) { + public void visit(final ClassOrInterfaceType n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getScope().isPresent()) { n.getScope().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -519,26 +549,31 @@ public void visit(final ClassOrInterfaceType n, final Range arg) { } @Override - public void visit(final CompilationUnit n, final Range arg) { + public void visit(final CompilationUnit n, final Range arg) { { n.getImports().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getModule().isPresent()) { n.getModule().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getPackageDeclaration().isPresent()) { n.getPackageDeclaration().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -547,22 +582,26 @@ public void visit(final CompilationUnit n, final Range arg) { } @Override - public void visit(final ConditionalExpr n, final Range arg) { + public void visit(final ConditionalExpr n, final Range arg) { { n.getCondition().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getElseExpr().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getThenExpr().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -571,42 +610,51 @@ public void visit(final ConditionalExpr n, final Range arg) { } @Override - public void visit(final ConstructorDeclaration n, final Range arg) { + public void visit(final ConstructorDeclaration n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getReceiverParameter().isPresent()) { n.getReceiverParameter().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getThrownExceptions().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -615,14 +663,16 @@ public void visit(final ConstructorDeclaration n, final Range arg) { } @Override - public void visit(final ContinueStmt n, final Range arg) { + public void visit(final ContinueStmt n, final Range arg) { if (n.getLabel().isPresent()) { n.getLabel().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -631,18 +681,21 @@ public void visit(final ContinueStmt n, final Range arg) { } @Override - public void visit(final DoStmt n, final Range arg) { + public void visit(final DoStmt n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getCondition().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -651,10 +704,11 @@ public void visit(final DoStmt n, final Range arg) { } @Override - public void visit(final DoubleLiteralExpr n, final Range arg) { + public void visit(final DoubleLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -663,10 +717,11 @@ public void visit(final DoubleLiteralExpr n, final Range arg) { } @Override - public void visit(final EmptyStmt n, final Range arg) { + public void visit(final EmptyStmt n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -675,14 +730,16 @@ public void visit(final EmptyStmt n, final Range arg) { } @Override - public void visit(final EnclosedExpr n, final Range arg) { + public void visit(final EnclosedExpr n, final Range arg) { { n.getInner().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -691,26 +748,31 @@ public void visit(final EnclosedExpr n, final Range arg) { } @Override - public void visit(final EnumConstantDeclaration n, final Range arg) { + public void visit(final EnumConstantDeclaration n, final Range arg) { { n.getArguments().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getClassBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -719,34 +781,41 @@ public void visit(final EnumConstantDeclaration n, final Range arg) { } @Override - public void visit(final EnumDeclaration n, final Range arg) { + public void visit(final EnumDeclaration n, final Range arg) { { n.getEntries().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getImplementedTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getMembers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -755,22 +824,26 @@ public void visit(final EnumDeclaration n, final Range arg) { } @Override - public void visit(final ExplicitConstructorInvocationStmt n, final Range arg) { + public void visit(final ExplicitConstructorInvocationStmt n, final Range arg) { { n.getArguments().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getExpression().isPresent()) { n.getExpression().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -779,14 +852,16 @@ public void visit(final ExplicitConstructorInvocationStmt n, final Range arg) { } @Override - public void visit(final ExpressionStmt n, final Range arg) { + public void visit(final ExpressionStmt n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -795,22 +870,26 @@ public void visit(final ExpressionStmt n, final Range arg) { } @Override - public void visit(final FieldAccessExpr n, final Range arg) { + public void visit(final FieldAccessExpr n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getScope().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -819,22 +898,26 @@ public void visit(final FieldAccessExpr n, final Range arg) { } @Override - public void visit(final FieldDeclaration n, final Range arg) { + public void visit(final FieldDeclaration n, final Range arg) { { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getVariables().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -843,22 +926,26 @@ public void visit(final FieldDeclaration n, final Range arg) { } @Override - public void visit(final ForEachStmt n, final Range arg) { + public void visit(final ForEachStmt n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getIterable().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getVariable().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -867,26 +954,31 @@ public void visit(final ForEachStmt n, final Range arg) { } @Override - public void visit(final ForStmt n, final Range arg) { + public void visit(final ForStmt n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getCompare().isPresent()) { n.getCompare().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getInitialization().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getUpdate().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -895,22 +987,26 @@ public void visit(final ForStmt n, final Range arg) { } @Override - public void visit(final IfStmt n, final Range arg) { + public void visit(final IfStmt n, final Range arg) { { n.getCondition().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getElseStmt().isPresent()) { n.getElseStmt().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getThenStmt().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -919,18 +1015,21 @@ public void visit(final IfStmt n, final Range arg) { } @Override - public void visit(final InitializerDeclaration n, final Range arg) { + public void visit(final InitializerDeclaration n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -939,22 +1038,26 @@ public void visit(final InitializerDeclaration n, final Range arg) { } @Override - public void visit(final InstanceOfExpr n, final Range arg) { + public void visit(final InstanceOfExpr n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getPattern().isPresent()) { n.getPattern().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -963,19 +1066,21 @@ public void visit(final InstanceOfExpr n, final Range arg) { } @Override - public void visit(final IntegerLiteralExpr n, final Range arg) { + public void visit(final IntegerLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } return; } @Override - public void visit(final JavadocComment n, final Range arg) { + public void visit(final JavadocComment n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -984,18 +1089,21 @@ public void visit(final JavadocComment n, final Range arg) { } @Override - public void visit(final LabeledStmt n, final Range arg) { + public void visit(final LabeledStmt n, final Range arg) { { n.getLabel().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getStatement().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1004,10 +1112,11 @@ public void visit(final LabeledStmt n, final Range arg) { } @Override - public void visit(final LongLiteralExpr n, final Range arg) { + public void visit(final LongLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1016,14 +1125,16 @@ public void visit(final LongLiteralExpr n, final Range arg) { } @Override - public void visit(final MarkerAnnotationExpr n, final Range arg) { + public void visit(final MarkerAnnotationExpr n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1032,18 +1143,21 @@ public void visit(final MarkerAnnotationExpr n, final Range arg) { } @Override - public void visit(final MemberValuePair n, final Range arg) { + public void visit(final MemberValuePair n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getValue().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1052,26 +1166,31 @@ public void visit(final MemberValuePair n, final Range arg) { } @Override - public void visit(final MethodCallExpr n, final Range arg) { + public void visit(final MethodCallExpr n, final Range arg) { { n.getArguments().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getScope().isPresent()) { n.getScope().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1080,46 +1199,56 @@ public void visit(final MethodCallExpr n, final Range arg) { } @Override - public void visit(final MethodDeclaration n, final Range arg) { + public void visit(final MethodDeclaration n, final Range arg) { if (n.getBody().isPresent()) { n.getBody().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getReceiverParameter().isPresent()) { n.getReceiverParameter().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getThrownExceptions().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1128,14 +1257,16 @@ public void visit(final MethodDeclaration n, final Range arg) { } @Override - public void visit(final NameExpr n, final Range arg) { + public void visit(final NameExpr n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1144,18 +1275,21 @@ public void visit(final NameExpr n, final Range arg) { } @Override - public void visit(final NormalAnnotationExpr n, final Range arg) { + public void visit(final NormalAnnotationExpr n, final Range arg) { { n.getPairs().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1164,10 +1298,11 @@ public void visit(final NormalAnnotationExpr n, final Range arg) { } @Override - public void visit(final NullLiteralExpr n, final Range arg) { + public void visit(final NullLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1176,30 +1311,36 @@ public void visit(final NullLiteralExpr n, final Range arg) { } @Override - public void visit(final ObjectCreationExpr n, final Range arg) { + public void visit(final ObjectCreationExpr n, final Range arg) { if (n.getAnonymousClassBody().isPresent()) { n.getAnonymousClassBody().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getArguments().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getScope().isPresent()) { n.getScope().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1208,18 +1349,21 @@ public void visit(final ObjectCreationExpr n, final Range arg) { } @Override - public void visit(final PackageDeclaration n, final Range arg) { + public void visit(final PackageDeclaration n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1228,30 +1372,36 @@ public void visit(final PackageDeclaration n, final Range arg) { } @Override - public void visit(final Parameter n, final Range arg) { + public void visit(final Parameter n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getVarArgsAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1260,14 +1410,16 @@ public void visit(final Parameter n, final Range arg) { } @Override - public void visit(final PrimitiveType n, final Range arg) { + public void visit(final PrimitiveType n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1276,14 +1428,16 @@ public void visit(final PrimitiveType n, final Range arg) { } @Override - public void visit(final Name n, final Range arg) { + public void visit(final Name n, final Range arg) { if (n.getQualifier().isPresent()) { n.getQualifier().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1292,10 +1446,11 @@ public void visit(final Name n, final Range arg) { } @Override - public void visit(final SimpleName n, final Range arg) { + public void visit(final SimpleName n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1304,18 +1459,21 @@ public void visit(final SimpleName n, final Range arg) { } @Override - public void visit(final ArrayType n, final Range arg) { + public void visit(final ArrayType n, final Range arg) { { n.getComponentType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1324,18 +1482,21 @@ public void visit(final ArrayType n, final Range arg) { } @Override - public void visit(final ArrayCreationLevel n, final Range arg) { + public void visit(final ArrayCreationLevel n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getDimension().isPresent()) { n.getDimension().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1344,18 +1505,21 @@ public void visit(final ArrayCreationLevel n, final Range arg) { } @Override - public void visit(final IntersectionType n, final Range arg) { + public void visit(final IntersectionType n, final Range arg) { { n.getElements().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1364,18 +1528,21 @@ public void visit(final IntersectionType n, final Range arg) { } @Override - public void visit(final UnionType n, final Range arg) { + public void visit(final UnionType n, final Range arg) { { n.getElements().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1384,14 +1551,16 @@ public void visit(final UnionType n, final Range arg) { } @Override - public void visit(final ReturnStmt n, final Range arg) { + public void visit(final ReturnStmt n, final Range arg) { if (n.getExpression().isPresent()) { n.getExpression().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1400,18 +1569,21 @@ public void visit(final ReturnStmt n, final Range arg) { } @Override - public void visit(final SingleMemberAnnotationExpr n, final Range arg) { + public void visit(final SingleMemberAnnotationExpr n, final Range arg) { { n.getMemberValue().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1420,10 +1592,11 @@ public void visit(final SingleMemberAnnotationExpr n, final Range arg) { } @Override - public void visit(final StringLiteralExpr n, final Range arg) { + public void visit(final StringLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1432,14 +1605,16 @@ public void visit(final StringLiteralExpr n, final Range arg) { } @Override - public void visit(final SuperExpr n, final Range arg) { + public void visit(final SuperExpr n, final Range arg) { if (n.getTypeName().isPresent()) { n.getTypeName().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1448,22 +1623,26 @@ public void visit(final SuperExpr n, final Range arg) { } @Override - public void visit(final SwitchEntry n, final Range arg) { + public void visit(final SwitchEntry n, final Range arg) { { n.getLabels().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getStatements().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getGuard().isPresent()) { n.getGuard().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1472,18 +1651,21 @@ public void visit(final SwitchEntry n, final Range arg) { } @Override - public void visit(final SwitchStmt n, final Range arg) { + public void visit(final SwitchStmt n, final Range arg) { { n.getEntries().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getSelector().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1492,18 +1674,21 @@ public void visit(final SwitchStmt n, final Range arg) { } @Override - public void visit(final SynchronizedStmt n, final Range arg) { + public void visit(final SynchronizedStmt n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1512,14 +1697,16 @@ public void visit(final SynchronizedStmt n, final Range arg) { } @Override - public void visit(final ThisExpr n, final Range arg) { + public void visit(final ThisExpr n, final Range arg) { if (n.getTypeName().isPresent()) { n.getTypeName().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1528,14 +1715,16 @@ public void visit(final ThisExpr n, final Range arg) { } @Override - public void visit(final ThrowStmt n, final Range arg) { + public void visit(final ThrowStmt n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1544,26 +1733,31 @@ public void visit(final ThrowStmt n, final Range arg) { } @Override - public void visit(final TryStmt n, final Range arg) { + public void visit(final TryStmt n, final Range arg) { { n.getCatchClauses().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getFinallyBlock().isPresent()) { n.getFinallyBlock().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getResources().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTryBlock().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1572,14 +1766,16 @@ public void visit(final TryStmt n, final Range arg) { } @Override - public void visit(final LocalClassDeclarationStmt n, final Range arg) { + public void visit(final LocalClassDeclarationStmt n, final Range arg) { { n.getClassDeclaration().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1588,14 +1784,16 @@ public void visit(final LocalClassDeclarationStmt n, final Range arg) { } @Override - public void visit(final LocalRecordDeclarationStmt n, final Range arg) { + public void visit(final LocalRecordDeclarationStmt n, final Range arg) { { n.getRecordDeclaration().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1604,22 +1802,26 @@ public void visit(final LocalRecordDeclarationStmt n, final Range arg) { } @Override - public void visit(final TypeParameter n, final Range arg) { + public void visit(final TypeParameter n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeBound().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1628,14 +1830,16 @@ public void visit(final TypeParameter n, final Range arg) { } @Override - public void visit(final UnaryExpr n, final Range arg) { + public void visit(final UnaryExpr n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1644,14 +1848,16 @@ public void visit(final UnaryExpr n, final Range arg) { } @Override - public void visit(final UnknownType n, final Range arg) { + public void visit(final UnknownType n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1660,22 +1866,26 @@ public void visit(final UnknownType n, final Range arg) { } @Override - public void visit(final VariableDeclarationExpr n, final Range arg) { + public void visit(final VariableDeclarationExpr n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getVariables().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1684,22 +1894,26 @@ public void visit(final VariableDeclarationExpr n, final Range arg) { } @Override - public void visit(final VariableDeclarator n, final Range arg) { + public void visit(final VariableDeclarator n, final Range arg) { if (n.getInitializer().isPresent()) { n.getInitializer().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1708,14 +1922,16 @@ public void visit(final VariableDeclarator n, final Range arg) { } @Override - public void visit(final VoidType n, final Range arg) { + public void visit(final VoidType n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1724,18 +1940,21 @@ public void visit(final VoidType n, final Range arg) { } @Override - public void visit(final WhileStmt n, final Range arg) { + public void visit(final WhileStmt n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getCondition().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1744,22 +1963,26 @@ public void visit(final WhileStmt n, final Range arg) { } @Override - public void visit(final WildcardType n, final Range arg) { + public void visit(final WildcardType n, final Range arg) { if (n.getExtendedType().isPresent()) { n.getExtendedType().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getSuperType().isPresent()) { n.getSuperType().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1768,18 +1991,21 @@ public void visit(final WildcardType n, final Range arg) { } @Override - public void visit(final LambdaExpr n, final Range arg) { + public void visit(final LambdaExpr n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1788,18 +2014,21 @@ public void visit(final LambdaExpr n, final Range arg) { } @Override - public void visit(final MethodReferenceExpr n, final Range arg) { + public void visit(final MethodReferenceExpr n, final Range arg) { { n.getScope().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getTypeArguments().isPresent()) { n.getTypeArguments().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1808,14 +2037,16 @@ public void visit(final MethodReferenceExpr n, final Range arg) { } @Override - public void visit(final TypeExpr n, final Range arg) { + public void visit(final TypeExpr n, final Range arg) { { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1824,14 +2055,16 @@ public void visit(final TypeExpr n, final Range arg) { } @Override - public void visit(final ImportDeclaration n, final Range arg) { + public void visit(final ImportDeclaration n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1840,10 +2073,11 @@ public void visit(final ImportDeclaration n, final Range arg) { } @Override - public void visit(final BlockComment n, final Range arg) { + public void visit(final BlockComment n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1852,10 +2086,11 @@ public void visit(final BlockComment n, final Range arg) { } @Override - public void visit(final LineComment n, final Range arg) { + public void visit(final LineComment n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1864,7 +2099,7 @@ public void visit(final LineComment n, final Range arg) { } @Override - public void visit(NodeList n, final Range arg) { + public void visit(NodeList n, final Range arg) { for (final Object v : n) { ((Node) v).accept(this, arg); } @@ -1872,22 +2107,26 @@ public void visit(NodeList n, final Range arg) { } @Override - public void visit(final ModuleDeclaration n, final Range arg) { + public void visit(final ModuleDeclaration n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getDirectives().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1896,18 +2135,21 @@ public void visit(final ModuleDeclaration n, final Range arg) { } @Override - public void visit(final ModuleRequiresDirective n, final Range arg) { + public void visit(final ModuleRequiresDirective n, final Range arg) { { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1916,18 +2158,21 @@ public void visit(final ModuleRequiresDirective n, final Range arg) { } @Override() - public void visit(final ModuleExportsDirective n, final Range arg) { + public void visit(final ModuleExportsDirective n, final Range arg) { { n.getModuleNames().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1936,18 +2181,21 @@ public void visit(final ModuleExportsDirective n, final Range arg) { } @Override() - public void visit(final ModuleProvidesDirective n, final Range arg) { + public void visit(final ModuleProvidesDirective n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getWith().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1956,14 +2204,16 @@ public void visit(final ModuleProvidesDirective n, final Range arg) { } @Override() - public void visit(final ModuleUsesDirective n, final Range arg) { + public void visit(final ModuleUsesDirective n, final Range arg) { { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1972,18 +2222,21 @@ public void visit(final ModuleUsesDirective n, final Range arg) { } @Override - public void visit(final ModuleOpensDirective n, final Range arg) { + public void visit(final ModuleOpensDirective n, final Range arg) { { n.getModuleNames().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -1992,10 +2245,11 @@ public void visit(final ModuleOpensDirective n, final Range arg) { } @Override - public void visit(final UnparsableStmt n, final Range arg) { + public void visit(final UnparsableStmt n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2004,22 +2258,26 @@ public void visit(final UnparsableStmt n, final Range arg) { } @Override - public void visit(final ReceiverParameter n, final Range arg) { + public void visit(final ReceiverParameter n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2028,14 +2286,16 @@ public void visit(final ReceiverParameter n, final Range arg) { } @Override - public void visit(final VarType n, final Range arg) { + public void visit(final VarType n, final Range arg) { { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2044,10 +2304,11 @@ public void visit(final VarType n, final Range arg) { } @Override - public void visit(final Modifier n, final Range arg) { + public void visit(final Modifier n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2056,18 +2317,21 @@ public void visit(final Modifier n, final Range arg) { } @Override - public void visit(final SwitchExpr n, final Range arg) { + public void visit(final SwitchExpr n, final Range arg) { { n.getEntries().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getSelector().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2076,14 +2340,16 @@ public void visit(final SwitchExpr n, final Range arg) { } @Override - public void visit(final YieldStmt n, final Range arg) { + public void visit(final YieldStmt n, final Range arg) { { n.getExpression().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2092,10 +2358,11 @@ public void visit(final YieldStmt n, final Range arg) { } @Override - public void visit(final TextBlockLiteralExpr n, final Range arg) { + public void visit(final TextBlockLiteralExpr n, final Range arg) { if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2104,22 +2371,26 @@ public void visit(final TextBlockLiteralExpr n, final Range arg) { } @Override - public void visit(final TypePatternExpr n, final Range arg) { + public void visit(final TypePatternExpr n, final Range arg) { { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getType().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2128,42 +2399,51 @@ public void visit(final TypePatternExpr n, final Range arg) { } @Override - public void visit(final RecordDeclaration n, final Range arg) { + public void visit(final RecordDeclaration n, final Range arg) { { n.getImplementedTypes().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getReceiverParameter().isPresent()) { n.getReceiverParameter().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getMembers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; @@ -2172,34 +2452,41 @@ public void visit(final RecordDeclaration n, final Range arg) { } @Override - public void visit(final CompactConstructorDeclaration n, final Range arg) { + public void visit(final CompactConstructorDeclaration n, final Range arg) { { n.getBody().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getModifiers().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getName().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getThrownExceptions().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getTypeParameters().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } { n.getAnnotations().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (n.getComment().isPresent()) { n.getComment().get().accept(this, arg); - if (selectedNode != null) return; + if (selectedNode != null) + return; } if (fn.apply(n, arg)) { selectedNode = n; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java index f8f84755e6..58dfef72a7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java @@ -29,13 +29,18 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * A visitor that calculates deep node equality by comparing all properties and child nodes of the node. * * @author Julio Vilmar Gesser */ -public class ObjectIdentityEqualsVisitor implements GenericVisitor { +public class ObjectIdentityEqualsVisitor implements GenericVisitor { private static final ObjectIdentityEqualsVisitor SINGLETON = new ObjectIdentityEqualsVisitor(); @@ -44,677 +49,677 @@ public static boolean equals(final Node n, final Node n2) { } @Override - public Boolean visit(final CompilationUnit n, final Visitable arg) { + public Boolean visit(final CompilationUnit n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final PackageDeclaration n, final Visitable arg) { + public Boolean visit(final PackageDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final TypeParameter n, final Visitable arg) { + public Boolean visit(final TypeParameter n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LineComment n, final Visitable arg) { + public Boolean visit(final LineComment n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final BlockComment n, final Visitable arg) { + public Boolean visit(final BlockComment n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final EnumDeclaration n, final Visitable arg) { + public Boolean visit(final EnumDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { + public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { + public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final FieldDeclaration n, final Visitable arg) { + public Boolean visit(final FieldDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final VariableDeclarator n, final Visitable arg) { + public Boolean visit(final VariableDeclarator n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final MethodDeclaration n, final Visitable arg) { + public Boolean visit(final MethodDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final Parameter n, final Visitable arg) { + public Boolean visit(final Parameter n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final InitializerDeclaration n, final Visitable arg) { + public Boolean visit(final InitializerDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JavadocComment n, final Visitable arg) { + public Boolean visit(final JavadocComment n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { + public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final PrimitiveType n, final Visitable arg) { + public Boolean visit(final PrimitiveType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ArrayType n, final Visitable arg) { + public Boolean visit(final ArrayType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { + public Boolean visit(final ArrayCreationLevel n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final IntersectionType n, final Visitable arg) { + public Boolean visit(final IntersectionType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final UnionType n, final Visitable arg) { + public Boolean visit(final UnionType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final VoidType n, final Visitable arg) { + public Boolean visit(final VoidType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final WildcardType n, final Visitable arg) { + public Boolean visit(final WildcardType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final UnknownType n, final Visitable arg) { + public Boolean visit(final UnknownType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { + public Boolean visit(final ArrayAccessExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { + public Boolean visit(final ArrayCreationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { + public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final AssignExpr n, final Visitable arg) { + public Boolean visit(final AssignExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final BinaryExpr n, final Visitable arg) { + public Boolean visit(final BinaryExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final CastExpr n, final Visitable arg) { + public Boolean visit(final CastExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ClassExpr n, final Visitable arg) { + public Boolean visit(final ClassExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ConditionalExpr n, final Visitable arg) { + public Boolean visit(final ConditionalExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final EnclosedExpr n, final Visitable arg) { + public Boolean visit(final EnclosedExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final FieldAccessExpr n, final Visitable arg) { + public Boolean visit(final FieldAccessExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final InstanceOfExpr n, final Visitable arg) { + public Boolean visit(final InstanceOfExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final StringLiteralExpr n, final Visitable arg) { + public Boolean visit(final StringLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { + public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LongLiteralExpr n, final Visitable arg) { + public Boolean visit(final LongLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final CharLiteralExpr n, final Visitable arg) { + public Boolean visit(final CharLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { + public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { + public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final NullLiteralExpr n, final Visitable arg) { + public Boolean visit(final NullLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final MethodCallExpr n, final Visitable arg) { + public Boolean visit(final MethodCallExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final NameExpr n, final Visitable arg) { + public Boolean visit(final NameExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { + public Boolean visit(final ObjectCreationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final Name n, final Visitable arg) { + public Boolean visit(final Name n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SimpleName n, final Visitable arg) { + public Boolean visit(final SimpleName n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ThisExpr n, final Visitable arg) { + public Boolean visit(final ThisExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SuperExpr n, final Visitable arg) { + public Boolean visit(final SuperExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final UnaryExpr n, final Visitable arg) { + public Boolean visit(final UnaryExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { + public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { + public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { + public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { + public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final MemberValuePair n, final Visitable arg) { + public Boolean visit(final MemberValuePair n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { + public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { + public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final AssertStmt n, final Visitable arg) { + public Boolean visit(final AssertStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final BlockStmt n, final Visitable arg) { + public Boolean visit(final BlockStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LabeledStmt n, final Visitable arg) { + public Boolean visit(final LabeledStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final EmptyStmt n, final Visitable arg) { + public Boolean visit(final EmptyStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ExpressionStmt n, final Visitable arg) { + public Boolean visit(final ExpressionStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SwitchStmt n, final Visitable arg) { + public Boolean visit(final SwitchStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SwitchEntry n, final Visitable arg) { + public Boolean visit(final SwitchEntry n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final BreakStmt n, final Visitable arg) { + public Boolean visit(final BreakStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ReturnStmt n, final Visitable arg) { + public Boolean visit(final ReturnStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final IfStmt n, final Visitable arg) { + public Boolean visit(final IfStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final WhileStmt n, final Visitable arg) { + public Boolean visit(final WhileStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ContinueStmt n, final Visitable arg) { + public Boolean visit(final ContinueStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final DoStmt n, final Visitable arg) { + public Boolean visit(final DoStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ForEachStmt n, final Visitable arg) { + public Boolean visit(final ForEachStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ForStmt n, final Visitable arg) { + public Boolean visit(final ForStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ThrowStmt n, final Visitable arg) { + public Boolean visit(final ThrowStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SynchronizedStmt n, final Visitable arg) { + public Boolean visit(final SynchronizedStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final TryStmt n, final Visitable arg) { + public Boolean visit(final TryStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final CatchClause n, final Visitable arg) { + public Boolean visit(final CatchClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final LambdaExpr n, final Visitable arg) { + public Boolean visit(final LambdaExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { + public Boolean visit(final MethodReferenceExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final TypeExpr n, final Visitable arg) { + public Boolean visit(final TypeExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ImportDeclaration n, final Visitable arg) { + public Boolean visit(final ImportDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(NodeList n, Visitable arg) { + public Boolean visit(NodeList n, Visitable arg) { return n == arg; } @Override - public Boolean visit(final ModuleDeclaration n, final Visitable arg) { + public Boolean visit(final ModuleDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { + public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) { return n == arg; } @Override() - public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { + public Boolean visit(final ModuleExportsDirective n, final Visitable arg) { return n == arg; } @Override() - public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { + public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) { return n == arg; } @Override() - public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { + public Boolean visit(final ModuleUsesDirective n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { + public Boolean visit(final ModuleOpensDirective n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final UnparsableStmt n, final Visitable arg) { + public Boolean visit(final UnparsableStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final ReceiverParameter n, final Visitable arg) { + public Boolean visit(final ReceiverParameter n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final VarType n, final Visitable arg) { + public Boolean visit(final VarType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final Modifier n, final Visitable arg) { + public Boolean visit(final Modifier n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final SwitchExpr n, final Visitable arg) { + public Boolean visit(final SwitchExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final YieldStmt n, final Visitable arg) { + public Boolean visit(final YieldStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { + public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final TypePatternExpr n, final Visitable arg) { + public Boolean visit(final TypePatternExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { + public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlClauseLabel n, final Visitable arg) { + public Boolean visit(final JmlClauseLabel n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { + public Boolean visit(final JmlExpressionStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlLabelExpr n, final Visitable arg) { + public Boolean visit(final JmlLabelExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlLetExpr n, final Visitable arg) { + public Boolean visit(final JmlLetExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { + public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { + public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlSignalsClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { + public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { + public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlCallableClause n, final Visitable arg) { + public Boolean visit(final JmlCallableClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlForallClause n, final Visitable arg) { + public Boolean visit(final JmlForallClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { + public Boolean visit(final JmlRefiningStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlClauseIf n, final Visitable arg) { + public Boolean visit(final JmlClauseIf n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { + public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { + public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlContract n, final Visitable arg) { + public Boolean visit(final JmlContract n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { + public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlGhostStmt n, final Visitable arg) { + public Boolean visit(final JmlGhostStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final RecordDeclaration n, final Visitable arg) { + public Boolean visit(final RecordDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { + public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final RecordPatternExpr n, final Visitable arg) { + public Boolean visit(final RecordPatternExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { + public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { + public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { + public Boolean visit(final JmlDocDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlDocStmt n, final Visitable arg) { + public Boolean visit(final JmlDocStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlDoc n, final Visitable arg) { + public Boolean visit(final JmlDoc n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlDocType n, final Visitable arg) { + public Boolean visit(final JmlDocType n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { + public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlOldClause n, final Visitable arg) { + public Boolean visit(final JmlOldClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlTypeExpr n, final Visitable arg) { + public Boolean visit(final JmlTypeExpr n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { + public Boolean visit(final JmlMultiExprClause n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlBeginStmt n, final Visitable arg) { + public Boolean visit(final JmlBeginStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlEndStmt n, final Visitable arg) { + public Boolean visit(final JmlEndStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlLabelStmt n, final Visitable arg) { + public Boolean visit(final JmlLabelStmt n, final Visitable arg) { return n == arg; } @Override - public Boolean visit(final JmlMethodSignature n, final Visitable arg) { + public Boolean visit(final JmlMethodSignature n, final Visitable arg) { return n == arg; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java index 778da6cffc..aa35904303 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java @@ -29,12 +29,18 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.modules.*; /** * A visitor that calculates a deep hash code for a node by using the hash codes of all its properties, * and the hash codes of all its child nodes (by visiting those too.) */ -public class ObjectIdentityHashCodeVisitor implements GenericVisitor { +public class ObjectIdentityHashCodeVisitor implements GenericVisitor { private static final ObjectIdentityHashCodeVisitor SINGLETON = new ObjectIdentityHashCodeVisitor(); @@ -42,592 +48,592 @@ public static int hashCode(final Node node) { return node.accept(SINGLETON, null); } - public Integer visit(final AnnotationDeclaration n, final Void arg) { + public Integer visit(final AnnotationDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { + public Integer visit(final AnnotationMemberDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ArrayAccessExpr n, final Void arg) { + public Integer visit(final ArrayAccessExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ArrayCreationExpr n, final Void arg) { + public Integer visit(final ArrayCreationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ArrayCreationLevel n, final Void arg) { + public Integer visit(final ArrayCreationLevel n, final Void arg) { return n.hashCode(); } - public Integer visit(final ArrayInitializerExpr n, final Void arg) { + public Integer visit(final ArrayInitializerExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ArrayType n, final Void arg) { + public Integer visit(final ArrayType n, final Void arg) { return n.hashCode(); } - public Integer visit(final AssertStmt n, final Void arg) { + public Integer visit(final AssertStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final AssignExpr n, final Void arg) { + public Integer visit(final AssignExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final BinaryExpr n, final Void arg) { + public Integer visit(final BinaryExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final BlockComment n, final Void arg) { + public Integer visit(final BlockComment n, final Void arg) { return n.hashCode(); } - public Integer visit(final BlockStmt n, final Void arg) { + public Integer visit(final BlockStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final BooleanLiteralExpr n, final Void arg) { + public Integer visit(final BooleanLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final BreakStmt n, final Void arg) { + public Integer visit(final BreakStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final CastExpr n, final Void arg) { + public Integer visit(final CastExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final CatchClause n, final Void arg) { + public Integer visit(final CatchClause n, final Void arg) { return n.hashCode(); } - public Integer visit(final CharLiteralExpr n, final Void arg) { + public Integer visit(final CharLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ClassExpr n, final Void arg) { + public Integer visit(final ClassExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { + public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ClassOrInterfaceType n, final Void arg) { + public Integer visit(final ClassOrInterfaceType n, final Void arg) { return n.hashCode(); } - public Integer visit(final CompilationUnit n, final Void arg) { + public Integer visit(final CompilationUnit n, final Void arg) { return n.hashCode(); } - public Integer visit(final ConditionalExpr n, final Void arg) { + public Integer visit(final ConditionalExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ConstructorDeclaration n, final Void arg) { + public Integer visit(final ConstructorDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ContinueStmt n, final Void arg) { + public Integer visit(final ContinueStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final DoStmt n, final Void arg) { + public Integer visit(final DoStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final DoubleLiteralExpr n, final Void arg) { + public Integer visit(final DoubleLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final EmptyStmt n, final Void arg) { + public Integer visit(final EmptyStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final EnclosedExpr n, final Void arg) { + public Integer visit(final EnclosedExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final EnumConstantDeclaration n, final Void arg) { + public Integer visit(final EnumConstantDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final EnumDeclaration n, final Void arg) { + public Integer visit(final EnumDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { + public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final ExpressionStmt n, final Void arg) { + public Integer visit(final ExpressionStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final FieldAccessExpr n, final Void arg) { + public Integer visit(final FieldAccessExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final FieldDeclaration n, final Void arg) { + public Integer visit(final FieldDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ForStmt n, final Void arg) { + public Integer visit(final ForStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final ForEachStmt n, final Void arg) { + public Integer visit(final ForEachStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final IfStmt n, final Void arg) { + public Integer visit(final IfStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final ImportDeclaration n, final Void arg) { + public Integer visit(final ImportDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final InitializerDeclaration n, final Void arg) { + public Integer visit(final InitializerDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final InstanceOfExpr n, final Void arg) { + public Integer visit(final InstanceOfExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final IntegerLiteralExpr n, final Void arg) { + public Integer visit(final IntegerLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final IntersectionType n, final Void arg) { + public Integer visit(final IntersectionType n, final Void arg) { return n.hashCode(); } - public Integer visit(final JavadocComment n, final Void arg) { + public Integer visit(final JavadocComment n, final Void arg) { return n.hashCode(); } - public Integer visit(final LabeledStmt n, final Void arg) { + public Integer visit(final LabeledStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final LambdaExpr n, final Void arg) { + public Integer visit(final LambdaExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final LineComment n, final Void arg) { + public Integer visit(final LineComment n, final Void arg) { return n.hashCode(); } - public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { + public Integer visit(final LocalClassDeclarationStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { + public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final LongLiteralExpr n, final Void arg) { + public Integer visit(final LongLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final MarkerAnnotationExpr n, final Void arg) { + public Integer visit(final MarkerAnnotationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final MemberValuePair n, final Void arg) { + public Integer visit(final MemberValuePair n, final Void arg) { return n.hashCode(); } - public Integer visit(final MethodCallExpr n, final Void arg) { + public Integer visit(final MethodCallExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final MethodDeclaration n, final Void arg) { + public Integer visit(final MethodDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final MethodReferenceExpr n, final Void arg) { + public Integer visit(final MethodReferenceExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final NameExpr n, final Void arg) { + public Integer visit(final NameExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final Name n, final Void arg) { + public Integer visit(final Name n, final Void arg) { return n.hashCode(); } - public Integer visit(NodeList n, Void arg) { + public Integer visit(NodeList n, Void arg) { return n.hashCode(); } - public Integer visit(final NormalAnnotationExpr n, final Void arg) { + public Integer visit(final NormalAnnotationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final NullLiteralExpr n, final Void arg) { + public Integer visit(final NullLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ObjectCreationExpr n, final Void arg) { + public Integer visit(final ObjectCreationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final PackageDeclaration n, final Void arg) { + public Integer visit(final PackageDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final Parameter n, final Void arg) { + public Integer visit(final Parameter n, final Void arg) { return n.hashCode(); } - public Integer visit(final PrimitiveType n, final Void arg) { + public Integer visit(final PrimitiveType n, final Void arg) { return n.hashCode(); } - public Integer visit(final ReturnStmt n, final Void arg) { + public Integer visit(final ReturnStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final SimpleName n, final Void arg) { + public Integer visit(final SimpleName n, final Void arg) { return n.hashCode(); } - public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { + public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final StringLiteralExpr n, final Void arg) { + public Integer visit(final StringLiteralExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final SuperExpr n, final Void arg) { + public Integer visit(final SuperExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final SwitchEntry n, final Void arg) { + public Integer visit(final SwitchEntry n, final Void arg) { return n.hashCode(); } - public Integer visit(final SwitchStmt n, final Void arg) { + public Integer visit(final SwitchStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final SynchronizedStmt n, final Void arg) { + public Integer visit(final SynchronizedStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final ThisExpr n, final Void arg) { + public Integer visit(final ThisExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final ThrowStmt n, final Void arg) { + public Integer visit(final ThrowStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final TryStmt n, final Void arg) { + public Integer visit(final TryStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final TypeExpr n, final Void arg) { + public Integer visit(final TypeExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final TypeParameter n, final Void arg) { + public Integer visit(final TypeParameter n, final Void arg) { return n.hashCode(); } - public Integer visit(final UnaryExpr n, final Void arg) { + public Integer visit(final UnaryExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final UnionType n, final Void arg) { + public Integer visit(final UnionType n, final Void arg) { return n.hashCode(); } - public Integer visit(final UnknownType n, final Void arg) { + public Integer visit(final UnknownType n, final Void arg) { return n.hashCode(); } - public Integer visit(final VariableDeclarationExpr n, final Void arg) { + public Integer visit(final VariableDeclarationExpr n, final Void arg) { return n.hashCode(); } - public Integer visit(final VariableDeclarator n, final Void arg) { + public Integer visit(final VariableDeclarator n, final Void arg) { return n.hashCode(); } - public Integer visit(final VoidType n, final Void arg) { + public Integer visit(final VoidType n, final Void arg) { return n.hashCode(); } - public Integer visit(final WhileStmt n, final Void arg) { + public Integer visit(final WhileStmt n, final Void arg) { return n.hashCode(); } - public Integer visit(final WildcardType n, final Void arg) { + public Integer visit(final WildcardType n, final Void arg) { return n.hashCode(); } - public Integer visit(final ModuleDeclaration n, final Void arg) { + public Integer visit(final ModuleDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final ModuleRequiresDirective n, final Void arg) { + public Integer visit(final ModuleRequiresDirective n, final Void arg) { return n.hashCode(); } @Override() - public Integer visit(final ModuleExportsDirective n, final Void arg) { + public Integer visit(final ModuleExportsDirective n, final Void arg) { return n.hashCode(); } @Override() - public Integer visit(final ModuleProvidesDirective n, final Void arg) { + public Integer visit(final ModuleProvidesDirective n, final Void arg) { return n.hashCode(); } @Override() - public Integer visit(final ModuleUsesDirective n, final Void arg) { + public Integer visit(final ModuleUsesDirective n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final ModuleOpensDirective n, final Void arg) { + public Integer visit(final ModuleOpensDirective n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final UnparsableStmt n, final Void arg) { + public Integer visit(final UnparsableStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final ReceiverParameter n, final Void arg) { + public Integer visit(final ReceiverParameter n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final VarType n, final Void arg) { + public Integer visit(final VarType n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final Modifier n, final Void arg) { + public Integer visit(final Modifier n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final SwitchExpr n, final Void arg) { + public Integer visit(final SwitchExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final YieldStmt n, final Void arg) { + public Integer visit(final YieldStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final TextBlockLiteralExpr n, final Void arg) { + public Integer visit(final TextBlockLiteralExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final TypePatternExpr n, final Void arg) { + public Integer visit(final TypePatternExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlQuantifiedExpr n, final Void arg) { + public Integer visit(final JmlQuantifiedExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlClauseLabel n, final Void arg) { + public Integer visit(final JmlClauseLabel n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlExpressionStmt n, final Void arg) { + public Integer visit(final JmlExpressionStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlLabelExpr n, final Void arg) { + public Integer visit(final JmlLabelExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlLetExpr n, final Void arg) { + public Integer visit(final JmlLetExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlMultiCompareExpr n, final Void arg) { + public Integer visit(final JmlMultiCompareExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlSimpleExprClause n, final Void arg) { + public Integer visit(final JmlSimpleExprClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlSignalsClause n, final Void arg) { + public Integer visit(final JmlSignalsClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { + public Integer visit(final JmlSignalsOnlyClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlUnreachableStmt n, final Void arg) { + public Integer visit(final JmlUnreachableStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlCallableClause n, final Void arg) { + public Integer visit(final JmlCallableClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlForallClause n, final Void arg) { + public Integer visit(final JmlForallClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlRefiningStmt n, final Void arg) { + public Integer visit(final JmlRefiningStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlClauseIf n, final Void arg) { + public Integer visit(final JmlClauseIf n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlClassExprDeclaration n, final Void arg) { + public Integer visit(final JmlClassExprDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { + public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { + public Integer visit(final JmlRepresentsDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlContract n, final Void arg) { + public Integer visit(final JmlContract n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { + public Integer visit(final JmlSetComprehensionExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlGhostStmt n, final Void arg) { + public Integer visit(final JmlGhostStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final RecordDeclaration n, final Void arg) { + public Integer visit(final RecordDeclaration n, final Void arg) { return n.hashCode(); } - public Integer visit(final CompactConstructorDeclaration n, final Void arg) { + public Integer visit(final CompactConstructorDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final RecordPatternExpr n, final Void arg) { + public Integer visit(final RecordPatternExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlMethodDeclaration n, final Void arg) { + public Integer visit(final JmlMethodDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { + public Integer visit(final JmlBinaryInfixExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlDocDeclaration n, final Void arg) { + public Integer visit(final JmlDocDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlDocStmt n, final Void arg) { + public Integer visit(final JmlDocStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlDoc n, final Void arg) { + public Integer visit(final JmlDoc n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlDocType n, final Void arg) { + public Integer visit(final JmlDocType n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlFieldDeclaration n, final Void arg) { + public Integer visit(final JmlFieldDeclaration n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlOldClause n, final Void arg) { + public Integer visit(final JmlOldClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlTypeExpr n, final Void arg) { + public Integer visit(final JmlTypeExpr n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlMultiExprClause n, final Void arg) { + public Integer visit(final JmlMultiExprClause n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlBeginStmt n, final Void arg) { + public Integer visit(final JmlBeginStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlEndStmt n, final Void arg) { + public Integer visit(final JmlEndStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlLabelStmt n, final Void arg) { + public Integer visit(final JmlLabelStmt n, final Void arg) { return n.hashCode(); } @Override - public Integer visit(final JmlMethodSignature n, final Void arg) { + public Integer visit(final JmlMethodSignature n, final Void arg) { return n.hashCode(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java index 13cbc6cf2f..59828eb877 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java @@ -32,7 +32,7 @@ */ public abstract class TreeVisitor { - public void visitLeavesFirst(Node node) { + public void visitLeavesFirst(Node node) { for (Node child : node.getChildNodes()) { visitLeavesFirst(child); } @@ -46,7 +46,7 @@ public void visitLeavesFirst(Node node) { * @param node The node at which the traversal begins. * @see Pre-order traversal */ - public void visitPreOrder(Node node) { + public void visitPreOrder(Node node) { process(node); new ArrayList<>(node.getChildNodes()).forEach(this::visitPreOrder); } @@ -58,7 +58,7 @@ public void visitPreOrder(Node node) { * @param node The node at which the traversal begins. * @see Post-order traversal */ - public void visitPostOrder(Node node) { + public void visitPostOrder(Node node) { new ArrayList<>(node.getChildNodes()).forEach(this::visitPostOrder); process(node); } @@ -68,7 +68,7 @@ public void visitPostOrder(Node node) { * * @param node the start node, and the first one that is passed to process(node). */ - public void visitBreadthFirst(Node node) { + public void visitBreadthFirst(Node node) { final Queue queue = new LinkedList<>(); queue.offer(node); while (queue.size() > 0) { @@ -90,7 +90,7 @@ public void visitBreadthFirst(Node node) { /** * Performs a simple traversal over all nodes that have the passed node as their parent. */ - public void visitDirectChildren(Node node) { + public void visitDirectChildren(Node node) { new ArrayList<>(node.getChildNodes()).forEach(this::process); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/Visitable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/Visitable.java index 3baf8655d2..c52383ce1f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/Visitable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/Visitable.java @@ -20,7 +20,7 @@ */ package com.github.javaparser.ast.visitor; -public interface Visitable { +public interface Visitable { /** * Accept method for visitor support. diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java index 668fe46bbd..be9f72d321 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java @@ -26,6 +26,14 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.JmlDoc; +import com.github.javaparser.ast.jml.doc.JmlDocDeclaration; +import com.github.javaparser.ast.jml.doc.JmlDocStmt; +import com.github.javaparser.ast.jml.doc.JmlDocType; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.stmt.*; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; @@ -35,7 +43,7 @@ * * @author Julio Vilmar Gesser */ -public interface VoidVisitor { +public interface VoidVisitor { void visit(NodeList n, A arg); @@ -238,7 +246,6 @@ public interface VoidVisitor { void visit(TypePatternExpr n, A arg); void visit(RecordPatternExpr n, A arg); - void visit(PatternExpr n, A arg); void visit(JmlQuantifiedExpr jmlQuantifiedExpr, A arg); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java index 470f62330e..e9aa2604d1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java @@ -26,6 +26,11 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.jml.stmt.*; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; @@ -39,13 +44,13 @@ public abstract class VoidVisitorAdapter implements VoidVisitor { @Override - public void visit(final LocalRecordDeclarationStmt n, final A arg) { + public void visit(final LocalRecordDeclarationStmt n, final A arg) { n.getRecordDeclaration().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final AnnotationDeclaration n, final A arg) { + public void visit(final AnnotationDeclaration n, final A arg) { n.getMembers().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); @@ -54,7 +59,7 @@ public void visit(final AnnotationDeclaration n, final A arg) { } @Override - public void visit(final AnnotationMemberDeclaration n, final A arg) { + public void visit(final AnnotationMemberDeclaration n, final A arg) { n.getDefaultValue().ifPresent(l -> l.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); @@ -64,14 +69,14 @@ public void visit(final AnnotationMemberDeclaration n, final A arg) { } @Override - public void visit(final ArrayAccessExpr n, final A arg) { + public void visit(final ArrayAccessExpr n, final A arg) { n.getIndex().accept(this, arg); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ArrayCreationExpr n, final A arg) { + public void visit(final ArrayCreationExpr n, final A arg) { n.getElementType().accept(this, arg); n.getInitializer().ifPresent(l -> l.accept(this, arg)); n.getLevels().forEach(p -> p.accept(this, arg)); @@ -79,82 +84,82 @@ public void visit(final ArrayCreationExpr n, final A arg) { } @Override - public void visit(final ArrayInitializerExpr n, final A arg) { + public void visit(final ArrayInitializerExpr n, final A arg) { n.getValues().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final AssertStmt n, final A arg) { + public void visit(final AssertStmt n, final A arg) { n.getCheck().accept(this, arg); n.getMessage().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final AssignExpr n, final A arg) { + public void visit(final AssignExpr n, final A arg) { n.getTarget().accept(this, arg); n.getValue().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final BinaryExpr n, final A arg) { + public void visit(final BinaryExpr n, final A arg) { n.getLeft().accept(this, arg); n.getRight().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final BlockComment n, final A arg) { + public void visit(final BlockComment n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final BlockStmt n, final A arg) { + public void visit(final BlockStmt n, final A arg) { n.getContracts().forEach(p -> p.accept(this, arg)); n.getStatements().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final BooleanLiteralExpr n, final A arg) { + public void visit(final BooleanLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final BreakStmt n, final A arg) { + public void visit(final BreakStmt n, final A arg) { n.getLabel().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final CastExpr n, final A arg) { + public void visit(final CastExpr n, final A arg) { n.getExpression().accept(this, arg); n.getType().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final CatchClause n, final A arg) { + public void visit(final CatchClause n, final A arg) { n.getBody().accept(this, arg); n.getParameter().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final CharLiteralExpr n, final A arg) { + public void visit(final CharLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ClassExpr n, final A arg) { + public void visit(final ClassExpr n, final A arg) { n.getType().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ClassOrInterfaceDeclaration n, final A arg) { + public void visit(final ClassOrInterfaceDeclaration n, final A arg) { n.getExtendedTypes().forEach(p -> p.accept(this, arg)); n.getImplementedTypes().forEach(p -> p.accept(this, arg)); n.getPermittedTypes().forEach(p -> p.accept(this, arg)); @@ -167,7 +172,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final A arg) { } @Override - public void visit(final ClassOrInterfaceType n, final A arg) { + public void visit(final ClassOrInterfaceType n, final A arg) { n.getName().accept(this, arg); n.getScope().ifPresent(l -> l.accept(this, arg)); n.getTypeArguments().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); @@ -176,7 +181,7 @@ public void visit(final ClassOrInterfaceType n, final A arg) { } @Override - public void visit(final CompilationUnit n, final A arg) { + public void visit(final CompilationUnit n, final A arg) { n.getImports().forEach(p -> p.accept(this, arg)); n.getModule().ifPresent(l -> l.accept(this, arg)); n.getPackageDeclaration().ifPresent(l -> l.accept(this, arg)); @@ -185,7 +190,7 @@ public void visit(final CompilationUnit n, final A arg) { } @Override - public void visit(final ConditionalExpr n, final A arg) { + public void visit(final ConditionalExpr n, final A arg) { n.getCondition().accept(this, arg); n.getElseExpr().accept(this, arg); n.getThenExpr().accept(this, arg); @@ -193,7 +198,7 @@ public void visit(final ConditionalExpr n, final A arg) { } @Override - public void visit(final ConstructorDeclaration n, final A arg) { + public void visit(final ConstructorDeclaration n, final A arg) { n.getBody().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); @@ -207,13 +212,13 @@ public void visit(final ConstructorDeclaration n, final A arg) { } @Override - public void visit(final ContinueStmt n, final A arg) { + public void visit(final ContinueStmt n, final A arg) { n.getLabel().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final DoStmt n, final A arg) { + public void visit(final DoStmt n, final A arg) { n.getBody().accept(this, arg); n.getCondition().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); @@ -221,23 +226,23 @@ public void visit(final DoStmt n, final A arg) { } @Override - public void visit(final DoubleLiteralExpr n, final A arg) { + public void visit(final DoubleLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final EmptyStmt n, final A arg) { + public void visit(final EmptyStmt n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final EnclosedExpr n, final A arg) { + public void visit(final EnclosedExpr n, final A arg) { n.getInner().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final EnumConstantDeclaration n, final A arg) { + public void visit(final EnumConstantDeclaration n, final A arg) { n.getArguments().forEach(p -> p.accept(this, arg)); n.getClassBody().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); @@ -246,7 +251,7 @@ public void visit(final EnumConstantDeclaration n, final A arg) { } @Override - public void visit(final EnumDeclaration n, final A arg) { + public void visit(final EnumDeclaration n, final A arg) { n.getEntries().forEach(p -> p.accept(this, arg)); n.getImplementedTypes().forEach(p -> p.accept(this, arg)); n.getMembers().forEach(p -> p.accept(this, arg)); @@ -257,7 +262,7 @@ public void visit(final EnumDeclaration n, final A arg) { } @Override - public void visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public void visit(final ExplicitConstructorInvocationStmt n, final A arg) { n.getArguments().forEach(p -> p.accept(this, arg)); n.getExpression().ifPresent(l -> l.accept(this, arg)); n.getTypeArguments().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); @@ -265,13 +270,13 @@ public void visit(final ExplicitConstructorInvocationStmt n, final A arg) { } @Override - public void visit(final ExpressionStmt n, final A arg) { + public void visit(final ExpressionStmt n, final A arg) { n.getExpression().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final FieldAccessExpr n, final A arg) { + public void visit(final FieldAccessExpr n, final A arg) { n.getName().accept(this, arg); n.getScope().accept(this, arg); n.getTypeArguments().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); @@ -279,7 +284,7 @@ public void visit(final FieldAccessExpr n, final A arg) { } @Override - public void visit(final FieldDeclaration n, final A arg) { + public void visit(final FieldDeclaration n, final A arg) { n.getModifiers().forEach(p -> p.accept(this, arg)); n.getVariables().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); @@ -287,7 +292,7 @@ public void visit(final FieldDeclaration n, final A arg) { } @Override - public void visit(final ForEachStmt n, final A arg) { + public void visit(final ForEachStmt n, final A arg) { n.getBody().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); n.getIterable().accept(this, arg); @@ -296,7 +301,7 @@ public void visit(final ForEachStmt n, final A arg) { } @Override - public void visit(final ForStmt n, final A arg) { + public void visit(final ForStmt n, final A arg) { n.getBody().accept(this, arg); n.getCompare().ifPresent(l -> l.accept(this, arg)); n.getContracts().forEach(p -> p.accept(this, arg)); @@ -306,7 +311,7 @@ public void visit(final ForStmt n, final A arg) { } @Override - public void visit(final IfStmt n, final A arg) { + public void visit(final IfStmt n, final A arg) { n.getCondition().accept(this, arg); n.getElseStmt().ifPresent(l -> l.accept(this, arg)); n.getThenStmt().accept(this, arg); @@ -314,14 +319,14 @@ public void visit(final IfStmt n, final A arg) { } @Override - public void visit(final InitializerDeclaration n, final A arg) { + public void visit(final InitializerDeclaration n, final A arg) { n.getBody().accept(this, arg); n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final InstanceOfExpr n, final A arg) { + public void visit(final InstanceOfExpr n, final A arg) { n.getExpression().accept(this, arg); n.getPattern().ifPresent(l -> l.accept(this, arg)); n.getType().accept(this, arg); @@ -329,47 +334,47 @@ public void visit(final InstanceOfExpr n, final A arg) { } @Override - public void visit(final IntegerLiteralExpr n, final A arg) { + public void visit(final IntegerLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JavadocComment n, final A arg) { + public void visit(final JavadocComment n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final LabeledStmt n, final A arg) { + public void visit(final LabeledStmt n, final A arg) { n.getLabel().accept(this, arg); n.getStatement().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final LineComment n, final A arg) { + public void visit(final LineComment n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final LongLiteralExpr n, final A arg) { + public void visit(final LongLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final MarkerAnnotationExpr n, final A arg) { + public void visit(final MarkerAnnotationExpr n, final A arg) { n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final MemberValuePair n, final A arg) { + public void visit(final MemberValuePair n, final A arg) { n.getName().accept(this, arg); n.getValue().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final MethodCallExpr n, final A arg) { + public void visit(final MethodCallExpr n, final A arg) { n.getArguments().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getScope().ifPresent(l -> l.accept(this, arg)); @@ -378,7 +383,7 @@ public void visit(final MethodCallExpr n, final A arg) { } @Override - public void visit(final MethodDeclaration n, final A arg) { + public void visit(final MethodDeclaration n, final A arg) { n.getBody().ifPresent(l -> l.accept(this, arg)); n.getType().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); @@ -393,25 +398,25 @@ public void visit(final MethodDeclaration n, final A arg) { } @Override - public void visit(final NameExpr n, final A arg) { + public void visit(final NameExpr n, final A arg) { n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final NormalAnnotationExpr n, final A arg) { + public void visit(final NormalAnnotationExpr n, final A arg) { n.getPairs().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final NullLiteralExpr n, final A arg) { + public void visit(final NullLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ObjectCreationExpr n, final A arg) { + public void visit(final ObjectCreationExpr n, final A arg) { n.getAnonymousClassBody().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); n.getArguments().forEach(p -> p.accept(this, arg)); n.getScope().ifPresent(l -> l.accept(this, arg)); @@ -421,14 +426,14 @@ public void visit(final ObjectCreationExpr n, final A arg) { } @Override - public void visit(final PackageDeclaration n, final A arg) { + public void visit(final PackageDeclaration n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final Parameter n, final A arg) { + public void visit(final Parameter n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); @@ -438,76 +443,76 @@ public void visit(final Parameter n, final A arg) { } @Override - public void visit(final PrimitiveType n, final A arg) { + public void visit(final PrimitiveType n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final Name n, final A arg) { + public void visit(final Name n, final A arg) { n.getQualifier().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SimpleName n, final A arg) { + public void visit(final SimpleName n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ArrayType n, final A arg) { + public void visit(final ArrayType n, final A arg) { n.getComponentType().accept(this, arg); n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ArrayCreationLevel n, final A arg) { + public void visit(final ArrayCreationLevel n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getDimension().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final IntersectionType n, final A arg) { + public void visit(final IntersectionType n, final A arg) { n.getElements().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final UnionType n, final A arg) { + public void visit(final UnionType n, final A arg) { n.getElements().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ReturnStmt n, final A arg) { + public void visit(final ReturnStmt n, final A arg) { n.getExpression().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SingleMemberAnnotationExpr n, final A arg) { + public void visit(final SingleMemberAnnotationExpr n, final A arg) { n.getMemberValue().accept(this, arg); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final StringLiteralExpr n, final A arg) { + public void visit(final StringLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SuperExpr n, final A arg) { + public void visit(final SuperExpr n, final A arg) { n.getTypeName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SwitchEntry n, final A arg) { + public void visit(final SwitchEntry n, final A arg) { n.getGuard().ifPresent(l -> l.accept(this, arg)); n.getLabels().forEach(p -> p.accept(this, arg)); n.getStatements().forEach(p -> p.accept(this, arg)); @@ -515,33 +520,33 @@ public void visit(final SwitchEntry n, final A arg) { } @Override - public void visit(final SwitchStmt n, final A arg) { + public void visit(final SwitchStmt n, final A arg) { n.getEntries().forEach(p -> p.accept(this, arg)); n.getSelector().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SynchronizedStmt n, final A arg) { + public void visit(final SynchronizedStmt n, final A arg) { n.getBody().accept(this, arg); n.getExpression().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ThisExpr n, final A arg) { + public void visit(final ThisExpr n, final A arg) { n.getTypeName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ThrowStmt n, final A arg) { + public void visit(final ThrowStmt n, final A arg) { n.getExpression().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final TryStmt n, final A arg) { + public void visit(final TryStmt n, final A arg) { n.getCatchClauses().forEach(p -> p.accept(this, arg)); n.getFinallyBlock().ifPresent(l -> l.accept(this, arg)); n.getResources().forEach(p -> p.accept(this, arg)); @@ -550,13 +555,13 @@ public void visit(final TryStmt n, final A arg) { } @Override - public void visit(final LocalClassDeclarationStmt n, final A arg) { + public void visit(final LocalClassDeclarationStmt n, final A arg) { n.getClassDeclaration().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final TypeParameter n, final A arg) { + public void visit(final TypeParameter n, final A arg) { n.getName().accept(this, arg); n.getTypeBound().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); @@ -564,19 +569,19 @@ public void visit(final TypeParameter n, final A arg) { } @Override - public void visit(final UnaryExpr n, final A arg) { + public void visit(final UnaryExpr n, final A arg) { n.getExpression().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final UnknownType n, final A arg) { + public void visit(final UnknownType n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final VariableDeclarationExpr n, final A arg) { + public void visit(final VariableDeclarationExpr n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); n.getVariables().forEach(p -> p.accept(this, arg)); @@ -584,7 +589,7 @@ public void visit(final VariableDeclarationExpr n, final A arg) { } @Override - public void visit(final VariableDeclarator n, final A arg) { + public void visit(final VariableDeclarator n, final A arg) { n.getInitializer().ifPresent(l -> l.accept(this, arg)); n.getName().accept(this, arg); n.getType().accept(this, arg); @@ -592,13 +597,13 @@ public void visit(final VariableDeclarator n, final A arg) { } @Override - public void visit(final VoidType n, final A arg) { + public void visit(final VoidType n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final WhileStmt n, final A arg) { + public void visit(final WhileStmt n, final A arg) { n.getBody().accept(this, arg); n.getCondition().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); @@ -606,7 +611,7 @@ public void visit(final WhileStmt n, final A arg) { } @Override - public void visit(final WildcardType n, final A arg) { + public void visit(final WildcardType n, final A arg) { n.getExtendedType().ifPresent(l -> l.accept(this, arg)); n.getSuperType().ifPresent(l -> l.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); @@ -614,7 +619,7 @@ public void visit(final WildcardType n, final A arg) { } @Override - public void visit(final LambdaExpr n, final A arg) { + public void visit(final LambdaExpr n, final A arg) { n.getBody().accept(this, arg); n.getContracts().forEach(p -> p.accept(this, arg)); n.getParameters().forEach(p -> p.accept(this, arg)); @@ -622,78 +627,78 @@ public void visit(final LambdaExpr n, final A arg) { } @Override - public void visit(final MethodReferenceExpr n, final A arg) { + public void visit(final MethodReferenceExpr n, final A arg) { n.getScope().accept(this, arg); n.getTypeArguments().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final TypeExpr n, final A arg) { + public void visit(final TypeExpr n, final A arg) { n.getType().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(NodeList n, A arg) { + public void visit(NodeList n, A arg) { for (Object node : n) { ((Node) node).accept(this, arg); } } @Override - public void visit(final ImportDeclaration n, final A arg) { + public void visit(final ImportDeclaration n, final A arg) { n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } - public void visit(final ModuleDeclaration n, final A arg) { + public void visit(final ModuleDeclaration n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getDirectives().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } - public void visit(final ModuleRequiresDirective n, final A arg) { + public void visit(final ModuleRequiresDirective n, final A arg) { n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ModuleExportsDirective n, final A arg) { + public void visit(final ModuleExportsDirective n, final A arg) { n.getModuleNames().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ModuleProvidesDirective n, final A arg) { + public void visit(final ModuleProvidesDirective n, final A arg) { n.getName().accept(this, arg); n.getWith().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ModuleUsesDirective n, final A arg) { + public void visit(final ModuleUsesDirective n, final A arg) { n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ModuleOpensDirective n, final A arg) { + public void visit(final ModuleOpensDirective n, final A arg) { n.getModuleNames().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final UnparsableStmt n, final A arg) { + public void visit(final UnparsableStmt n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final ReceiverParameter n, final A arg) { + public void visit(final ReceiverParameter n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getType().accept(this, arg); @@ -701,36 +706,36 @@ public void visit(final ReceiverParameter n, final A arg) { } @Override - public void visit(final VarType n, final A arg) { + public void visit(final VarType n, final A arg) { n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final Modifier n, final A arg) { + public void visit(final Modifier n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final SwitchExpr n, final A arg) { + public void visit(final SwitchExpr n, final A arg) { n.getEntries().forEach(p -> p.accept(this, arg)); n.getSelector().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final TextBlockLiteralExpr n, final A arg) { + public void visit(final TextBlockLiteralExpr n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final YieldStmt n, final A arg) { + public void visit(final YieldStmt n, final A arg) { n.getExpression().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final TypePatternExpr n, final A arg) { + public void visit(final TypePatternExpr n, final A arg) { n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getType().accept(this, arg); @@ -738,7 +743,7 @@ public void visit(final TypePatternExpr n, final A arg) { } @Override - public void visit(final JmlClauseLabel n, final A arg) { + public void visit(final JmlClauseLabel n, final A arg) { n.getExpr().accept(this, arg); n.getLabel().ifPresent(l -> l.accept(this, arg)); n.getName().ifPresent(l -> l.accept(this, arg)); @@ -746,41 +751,41 @@ public void visit(final JmlClauseLabel n, final A arg) { } @Override - public void visit(final JmlExpressionStmt n, final A arg) { + public void visit(final JmlExpressionStmt n, final A arg) { n.getExpression().accept(this, arg); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlQuantifiedExpr n, final A arg) { + public void visit(final JmlQuantifiedExpr n, final A arg) { n.getExpressions().forEach(p -> p.accept(this, arg)); n.getVariables().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlLabelExpr n, final A arg) { + public void visit(final JmlLabelExpr n, final A arg) { n.getExpression().accept(this, arg); n.getLabel().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlLetExpr n, final A arg) { + public void visit(final JmlLetExpr n, final A arg) { n.getBody().accept(this, arg); n.getVariables().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlMultiCompareExpr n, final A arg) { + public void visit(final JmlMultiCompareExpr n, final A arg) { n.getExpressions().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlSimpleExprClause n, final A arg) { + public void visit(final JmlSimpleExprClause n, final A arg) { n.getExpression().accept(this, arg); n.getHeaps().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); n.getName().ifPresent(l -> l.accept(this, arg)); @@ -788,7 +793,7 @@ public void visit(final JmlSimpleExprClause n, final A arg) { } @Override - public void visit(final JmlSignalsClause n, final A arg) { + public void visit(final JmlSignalsClause n, final A arg) { n.getExpression().accept(this, arg); n.getParameter().accept(this, arg); n.getName().ifPresent(l -> l.accept(this, arg)); @@ -796,40 +801,40 @@ public void visit(final JmlSignalsClause n, final A arg) { } @Override - public void visit(final JmlSignalsOnlyClause n, final A arg) { + public void visit(final JmlSignalsOnlyClause n, final A arg) { n.getTypes().forEach(p -> p.accept(this, arg)); n.getName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlUnreachableStmt n, final A arg) { + public void visit(final JmlUnreachableStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlCallableClause n, final A arg) { + public void visit(final JmlCallableClause n, final A arg) { n.getMethodSignatures().forEach(p -> p.accept(this, arg)); n.getName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlForallClause n, final A arg) { + public void visit(final JmlForallClause n, final A arg) { n.getBoundedVariables().forEach(p -> p.accept(this, arg)); n.getName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlRefiningStmt n, final A arg) { + public void visit(final JmlRefiningStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlClauseIf n, final A arg) { + public void visit(final JmlClauseIf n, final A arg) { n.getCondition().accept(this, arg); n.getThen().accept(this, arg); n.getName().ifPresent(l -> l.accept(this, arg)); @@ -837,7 +842,7 @@ public void visit(final JmlClauseIf n, final A arg) { } @Override - public void visit(final JmlClassExprDeclaration n, final A arg) { + public void visit(final JmlClassExprDeclaration n, final A arg) { n.getInvariant().accept(this, arg); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getKind().accept(this, arg); @@ -848,7 +853,7 @@ public void visit(final JmlClassExprDeclaration n, final A arg) { } @Override - public void visit(final JmlClassAccessibleDeclaration n, final A arg) { + public void visit(final JmlClassAccessibleDeclaration n, final A arg) { n.getExpressions().forEach(p -> p.accept(this, arg)); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getMeasuredBy().ifPresent(l -> l.accept(this, arg)); @@ -859,7 +864,7 @@ public void visit(final JmlClassAccessibleDeclaration n, final A arg) { } @Override - public void visit(final JmlRepresentsDeclaration n, final A arg) { + public void visit(final JmlRepresentsDeclaration n, final A arg) { n.getExpr().accept(this, arg); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); @@ -869,7 +874,7 @@ public void visit(final JmlRepresentsDeclaration n, final A arg) { } @Override - public void visit(final JmlContract n, final A arg) { + public void visit(final JmlContract n, final A arg) { n.getClauses().forEach(p -> p.accept(this, arg)); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); @@ -879,21 +884,21 @@ public void visit(final JmlContract n, final A arg) { } @Override - public void visit(final JmlSetComprehensionExpr n, final A arg) { + public void visit(final JmlSetComprehensionExpr n, final A arg) { n.getBinding().accept(this, arg); n.getPredicate().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlGhostStmt n, final A arg) { + public void visit(final JmlGhostStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getStatement().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final RecordDeclaration n, final A arg) { + public void visit(final RecordDeclaration n, final A arg) { n.getImplementedTypes().forEach(p -> p.accept(this, arg)); n.getParameters().forEach(p -> p.accept(this, arg)); n.getReceiverParameter().ifPresent(l -> l.accept(this, arg)); @@ -906,7 +911,7 @@ public void visit(final RecordDeclaration n, final A arg) { } @Override - public void visit(final CompactConstructorDeclaration n, final A arg) { + public void visit(final CompactConstructorDeclaration n, final A arg) { n.getBody().accept(this, arg); n.getModifiers().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); @@ -917,7 +922,7 @@ public void visit(final CompactConstructorDeclaration n, final A arg) { } @Override - public void visit(final RecordPatternExpr n, final A arg) { + public void visit(final RecordPatternExpr n, final A arg) { n.getModifiers().forEach(p -> p.accept(this, arg)); n.getPatternList().forEach(p -> p.accept(this, arg)); n.getType().accept(this, arg); @@ -925,7 +930,7 @@ public void visit(final RecordPatternExpr n, final A arg) { } @Override - public void visit(final JmlMethodDeclaration n, final A arg) { + public void visit(final JmlMethodDeclaration n, final A arg) { n.getContract().ifPresent(l -> l.accept(this, arg)); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getMethodDeclaration().accept(this, arg); @@ -934,7 +939,7 @@ public void visit(final JmlMethodDeclaration n, final A arg) { } @Override - public void visit(final JmlBinaryInfixExpr n, final A arg) { + public void visit(final JmlBinaryInfixExpr n, final A arg) { n.getLeft().accept(this, arg); n.getOperator().accept(this, arg); n.getRight().accept(this, arg); @@ -942,25 +947,25 @@ public void visit(final JmlBinaryInfixExpr n, final A arg) { } @Override - public void visit(final JmlDocDeclaration n, final A arg) { + public void visit(final JmlDocDeclaration n, final A arg) { n.getJmlComments().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlDocStmt n, final A arg) { + public void visit(final JmlDocStmt n, final A arg) { n.getJmlComments().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlDoc n, final A arg) { + public void visit(final JmlDoc n, final A arg) { n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlDocType n, final A arg) { + public void visit(final JmlDocType n, final A arg) { n.getJmlComments().forEach(p -> p.accept(this, arg)); n.getMembers().forEach(p -> p.accept(this, arg)); n.getModifiers().forEach(p -> p.accept(this, arg)); @@ -970,7 +975,7 @@ public void visit(final JmlDocType n, final A arg) { } @Override - public void visit(final JmlFieldDeclaration n, final A arg) { + public void visit(final JmlFieldDeclaration n, final A arg) { n.getDecl().accept(this, arg); n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); @@ -978,20 +983,20 @@ public void visit(final JmlFieldDeclaration n, final A arg) { } @Override - public void visit(final JmlOldClause n, final A arg) { + public void visit(final JmlOldClause n, final A arg) { n.getDeclarations().accept(this, arg); n.getName().ifPresent(l -> l.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlTypeExpr n, final A arg) { + public void visit(final JmlTypeExpr n, final A arg) { n.getType().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlMultiExprClause n, final A arg) { + public void visit(final JmlMultiExprClause n, final A arg) { n.getExpressions().forEach(p -> p.accept(this, arg)); n.getHeaps().ifPresent(l -> l.forEach(v -> v.accept(this, arg))); n.getName().ifPresent(l -> l.accept(this, arg)); @@ -999,26 +1004,26 @@ public void visit(final JmlMultiExprClause n, final A arg) { } @Override - public void visit(final JmlBeginStmt n, final A arg) { + public void visit(final JmlBeginStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlEndStmt n, final A arg) { + public void visit(final JmlEndStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlLabelStmt n, final A arg) { + public void visit(final JmlLabelStmt n, final A arg) { n.getJmlTags().forEach(p -> p.accept(this, arg)); n.getLabel().accept(this, arg); n.getComment().ifPresent(l -> l.accept(this, arg)); } @Override - public void visit(final JmlMethodSignature n, final A arg) { + public void visit(final JmlMethodSignature n, final A arg) { n.getArgumentTypes().forEach(p -> p.accept(this, arg)); n.getName().accept(this, arg); n.getReceiver().ifPresent(l -> l.accept(this, arg)); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java index 944720d6d8..599f8df0ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java @@ -29,6 +29,12 @@ import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.expr.*; +import com.github.javaparser.ast.modules.*; /** * A visitor that returns nothing, and has default methods that are used when a specific visit method is not @@ -39,683 +45,685 @@ public abstract class VoidVisitorWithDefaults implements VoidVisitor { /** * This will be called by every node visit method that is not overridden. */ - public void defaultAction(Node n, A arg) {} + public void defaultAction(Node n, A arg) { + } /** * This will be called by the NodeList visit method when it is not overridden. */ - public void defaultAction(NodeList n, A arg) {} + public void defaultAction(NodeList n, A arg) { + } @Override - public void visit(final LocalRecordDeclarationStmt n, final A arg) { + public void visit(final LocalRecordDeclarationStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final AnnotationDeclaration n, final A arg) { + public void visit(final AnnotationDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final AnnotationMemberDeclaration n, final A arg) { + public void visit(final AnnotationMemberDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ArrayAccessExpr n, final A arg) { + public void visit(final ArrayAccessExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ArrayCreationExpr n, final A arg) { + public void visit(final ArrayCreationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ArrayInitializerExpr n, final A arg) { + public void visit(final ArrayInitializerExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final AssertStmt n, final A arg) { + public void visit(final AssertStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final AssignExpr n, final A arg) { + public void visit(final AssignExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final BinaryExpr n, final A arg) { + public void visit(final BinaryExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final BlockComment n, final A arg) { + public void visit(final BlockComment n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final BlockStmt n, final A arg) { + public void visit(final BlockStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final BooleanLiteralExpr n, final A arg) { + public void visit(final BooleanLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final BreakStmt n, final A arg) { + public void visit(final BreakStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final CastExpr n, final A arg) { + public void visit(final CastExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final CatchClause n, final A arg) { + public void visit(final CatchClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final CharLiteralExpr n, final A arg) { + public void visit(final CharLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ClassExpr n, final A arg) { + public void visit(final ClassExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ClassOrInterfaceDeclaration n, final A arg) { + public void visit(final ClassOrInterfaceDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ClassOrInterfaceType n, final A arg) { + public void visit(final ClassOrInterfaceType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final CompilationUnit n, final A arg) { + public void visit(final CompilationUnit n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ConditionalExpr n, final A arg) { + public void visit(final ConditionalExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ConstructorDeclaration n, final A arg) { + public void visit(final ConstructorDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ContinueStmt n, final A arg) { + public void visit(final ContinueStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final DoStmt n, final A arg) { + public void visit(final DoStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final DoubleLiteralExpr n, final A arg) { + public void visit(final DoubleLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final EmptyStmt n, final A arg) { + public void visit(final EmptyStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final EnclosedExpr n, final A arg) { + public void visit(final EnclosedExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final EnumConstantDeclaration n, final A arg) { + public void visit(final EnumConstantDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final EnumDeclaration n, final A arg) { + public void visit(final EnumDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ExplicitConstructorInvocationStmt n, final A arg) { + public void visit(final ExplicitConstructorInvocationStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ExpressionStmt n, final A arg) { + public void visit(final ExpressionStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final FieldAccessExpr n, final A arg) { + public void visit(final FieldAccessExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final FieldDeclaration n, final A arg) { + public void visit(final FieldDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ForEachStmt n, final A arg) { + public void visit(final ForEachStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ForStmt n, final A arg) { + public void visit(final ForStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final IfStmt n, final A arg) { + public void visit(final IfStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final InitializerDeclaration n, final A arg) { + public void visit(final InitializerDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final InstanceOfExpr n, final A arg) { + public void visit(final InstanceOfExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final IntegerLiteralExpr n, final A arg) { + public void visit(final IntegerLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JavadocComment n, final A arg) { + public void visit(final JavadocComment n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final LabeledStmt n, final A arg) { + public void visit(final LabeledStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final LineComment n, final A arg) { + public void visit(final LineComment n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final LongLiteralExpr n, final A arg) { + public void visit(final LongLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final MarkerAnnotationExpr n, final A arg) { + public void visit(final MarkerAnnotationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final MemberValuePair n, final A arg) { + public void visit(final MemberValuePair n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final MethodCallExpr n, final A arg) { + public void visit(final MethodCallExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final MethodDeclaration n, final A arg) { + public void visit(final MethodDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final NameExpr n, final A arg) { + public void visit(final NameExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final NormalAnnotationExpr n, final A arg) { + public void visit(final NormalAnnotationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final NullLiteralExpr n, final A arg) { + public void visit(final NullLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ObjectCreationExpr n, final A arg) { + public void visit(final ObjectCreationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final PackageDeclaration n, final A arg) { + public void visit(final PackageDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final Parameter n, final A arg) { + public void visit(final Parameter n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final PrimitiveType n, final A arg) { + public void visit(final PrimitiveType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final Name n, final A arg) { + public void visit(final Name n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SimpleName n, final A arg) { + public void visit(final SimpleName n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ArrayType n, final A arg) { + public void visit(final ArrayType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ArrayCreationLevel n, final A arg) { + public void visit(final ArrayCreationLevel n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final IntersectionType n, final A arg) { + public void visit(final IntersectionType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final UnionType n, final A arg) { + public void visit(final UnionType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ReturnStmt n, final A arg) { + public void visit(final ReturnStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SingleMemberAnnotationExpr n, final A arg) { + public void visit(final SingleMemberAnnotationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final StringLiteralExpr n, final A arg) { + public void visit(final StringLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SuperExpr n, final A arg) { + public void visit(final SuperExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SwitchEntry n, final A arg) { + public void visit(final SwitchEntry n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SwitchStmt n, final A arg) { + public void visit(final SwitchStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SynchronizedStmt n, final A arg) { + public void visit(final SynchronizedStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ThisExpr n, final A arg) { + public void visit(final ThisExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ThrowStmt n, final A arg) { + public void visit(final ThrowStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final TryStmt n, final A arg) { + public void visit(final TryStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final LocalClassDeclarationStmt n, final A arg) { + public void visit(final LocalClassDeclarationStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final TypeParameter n, final A arg) { + public void visit(final TypeParameter n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final UnaryExpr n, final A arg) { + public void visit(final UnaryExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final UnknownType n, final A arg) { + public void visit(final UnknownType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final VariableDeclarationExpr n, final A arg) { + public void visit(final VariableDeclarationExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final VariableDeclarator n, final A arg) { + public void visit(final VariableDeclarator n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final VoidType n, final A arg) { + public void visit(final VoidType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final WhileStmt n, final A arg) { + public void visit(final WhileStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final WildcardType n, final A arg) { + public void visit(final WildcardType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final LambdaExpr n, final A arg) { + public void visit(final LambdaExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final MethodReferenceExpr n, final A arg) { + public void visit(final MethodReferenceExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final TypeExpr n, final A arg) { + public void visit(final TypeExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(NodeList n, A arg) { + public void visit(NodeList n, A arg) { defaultAction(n, arg); } @Override - public void visit(final ImportDeclaration n, final A arg) { + public void visit(final ImportDeclaration n, final A arg) { defaultAction(n, arg); } - public void visit(final ModuleDeclaration n, final A arg) { + public void visit(final ModuleDeclaration n, final A arg) { defaultAction(n, arg); } - public void visit(final ModuleRequiresDirective n, final A arg) { + public void visit(final ModuleRequiresDirective n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ModuleExportsDirective n, final A arg) { + public void visit(final ModuleExportsDirective n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ModuleProvidesDirective n, final A arg) { + public void visit(final ModuleProvidesDirective n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ModuleUsesDirective n, final A arg) { + public void visit(final ModuleUsesDirective n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ModuleOpensDirective n, final A arg) { + public void visit(final ModuleOpensDirective n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final UnparsableStmt n, final A arg) { + public void visit(final UnparsableStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final ReceiverParameter n, final A arg) { + public void visit(final ReceiverParameter n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final Modifier n, final A arg) { + public void visit(final Modifier n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final VarType n, final A arg) { + public void visit(final VarType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final SwitchExpr n, final A arg) { + public void visit(final SwitchExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final TextBlockLiteralExpr n, final A arg) { + public void visit(final TextBlockLiteralExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final YieldStmt n, final A arg) { + public void visit(final YieldStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final TypePatternExpr n, final A arg) { + public void visit(final TypePatternExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlQuantifiedExpr n, final A arg) { + public void visit(final JmlQuantifiedExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlClauseLabel n, final A arg) { + public void visit(final JmlClauseLabel n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlExpressionStmt n, final A arg) { + public void visit(final JmlExpressionStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlLabelExpr n, final A arg) { + public void visit(final JmlLabelExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlLetExpr n, final A arg) { + public void visit(final JmlLetExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlMultiCompareExpr n, final A arg) { + public void visit(final JmlMultiCompareExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlSimpleExprClause n, final A arg) { + public void visit(final JmlSimpleExprClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlSignalsClause n, final A arg) { + public void visit(final JmlSignalsClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlSignalsOnlyClause n, final A arg) { + public void visit(final JmlSignalsOnlyClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlUnreachableStmt n, final A arg) { + public void visit(final JmlUnreachableStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlCallableClause n, final A arg) { + public void visit(final JmlCallableClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlForallClause n, final A arg) { + public void visit(final JmlForallClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlRefiningStmt n, final A arg) { + public void visit(final JmlRefiningStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlClauseIf n, final A arg) { + public void visit(final JmlClauseIf n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlClassExprDeclaration n, final A arg) { + public void visit(final JmlClassExprDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlClassAccessibleDeclaration n, final A arg) { + public void visit(final JmlClassAccessibleDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlRepresentsDeclaration n, final A arg) { + public void visit(final JmlRepresentsDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlContract n, final A arg) { + public void visit(final JmlContract n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlSetComprehensionExpr n, final A arg) { + public void visit(final JmlSetComprehensionExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlGhostStmt n, final A arg) { + public void visit(final JmlGhostStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final RecordDeclaration n, final A arg) { + public void visit(final RecordDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final CompactConstructorDeclaration n, final A arg) { + public void visit(final CompactConstructorDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final RecordPatternExpr n, final A arg) { + public void visit(final RecordPatternExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlMethodDeclaration n, final A arg) { + public void visit(final JmlMethodDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlBinaryInfixExpr n, final A arg) { + public void visit(final JmlBinaryInfixExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlDocDeclaration n, final A arg) { + public void visit(final JmlDocDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlDocStmt n, final A arg) { + public void visit(final JmlDocStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlDoc n, final A arg) { + public void visit(final JmlDoc n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlDocType n, final A arg) { + public void visit(final JmlDocType n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlFieldDeclaration n, final A arg) { + public void visit(final JmlFieldDeclaration n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlOldClause n, final A arg) { + public void visit(final JmlOldClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlTypeExpr n, final A arg) { + public void visit(final JmlTypeExpr n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlMultiExprClause n, final A arg) { + public void visit(final JmlMultiExprClause n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlBeginStmt n, final A arg) { + public void visit(final JmlBeginStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlEndStmt n, final A arg) { + public void visit(final JmlEndStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlLabelStmt n, final A arg) { + public void visit(final JmlLabelStmt n, final A arg) { defaultAction(n, arg); } @Override - public void visit(final JmlMethodSignature n, final A arg) { + public void visit(final JmlMethodSignature n, final A arg) { defaultAction(n, arg); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java index 6cd5441152..ef2e2c5499 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java @@ -34,18 +34,18 @@ * An example would be the text contained in this very Javadoc comment. At the moment * of this writing this comment does not contain any block tags (such as {@code @see AnotherClass}) */ -public class Javadoc { +public class Javadoc { private JavadocDescription description; private List blockTags; - public Javadoc(JavadocDescription description) { + public Javadoc(JavadocDescription description) { this.description = description; this.blockTags = new LinkedList<>(); } - public Javadoc addBlockTag(JavadocBlockTag blockTag) { + public Javadoc addBlockTag(JavadocBlockTag blockTag) { this.blockTags.add(blockTag); return this; } @@ -55,7 +55,7 @@ public Javadoc addBlockTag(JavadocBlockTag blockTag) { * tagName is "return", * and the rest is content. */ - public Javadoc addBlockTag(String tagName, String content) { + public Javadoc addBlockTag(String tagName, String content) { return addBlockTag(new JavadocBlockTag(tagName, content)); } @@ -65,11 +65,11 @@ public Javadoc addBlockTag(String tagName, String content) { * parameter is "abc" * and the rest is content. */ - public Javadoc addBlockTag(String tagName, String parameter, String content) { + public Javadoc addBlockTag(String tagName, String parameter, String content) { return addBlockTag(tagName, parameter + " " + content); } - public Javadoc addBlockTag(String tagName) { + public Javadoc addBlockTag(String tagName) { return addBlockTag(tagName, ""); } @@ -77,7 +77,7 @@ public Javadoc addBlockTag(String tagName) { * Return the text content of the document. It does not containing trailing spaces and asterisks * at the start of the line. */ - public String toText() { + public String toText() { StringBuilder sb = new StringBuilder(); if (!description.isEmpty()) { sb.append(description.toText()); @@ -96,18 +96,17 @@ public String toText() { /** * Create a JavadocComment, by formatting the text of the Javadoc using no indentation (expecting the pretty printer to do the formatting.) */ - public JavadocComment toComment() { + public JavadocComment toComment() { return toComment(""); } /** * Create a JavadocComment, by formatting the text of the Javadoc using the given indentation. */ - public JavadocComment toComment(String indentation) { + public JavadocComment toComment(String indentation) { for (char c : indentation.toCharArray()) { if (!Character.isWhitespace(c)) { - throw new IllegalArgumentException( - "The indentation string should be composed only by whitespace characters"); + throw new IllegalArgumentException("The indentation string should be composed only by whitespace characters"); } } StringBuilder sb = new StringBuilder(); @@ -126,34 +125,36 @@ public JavadocComment toComment(String indentation) { return new JavadocComment(sb.toString()); } - public JavadocDescription getDescription() { + public JavadocDescription getDescription() { return description; } /** * @return the current List of associated JavadocBlockTags */ - public List getBlockTags() { + public List getBlockTags() { return this.blockTags; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Javadoc document = (Javadoc) o; return description.equals(document.description) && blockTags.equals(document.blockTags); } @Override - public int hashCode() { + public int hashCode() { int result = description.hashCode(); result = 31 * result + blockTags.hashCode(); return result; } @Override - public String toString() { + public String toString() { return "Javadoc{" + "description=" + description + ", blockTags=" + blockTags + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java index acaf15f4c7..515556d966 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java @@ -22,7 +22,6 @@ import static com.github.javaparser.utils.Utils.nextWord; import static com.github.javaparser.utils.Utils.screamingToCamelCase; - import com.github.javaparser.javadoc.description.JavadocDescription; import java.util.Optional; @@ -36,13 +35,14 @@ * {@code @since v0.0.1} * {@code @author Jim O'Java} */ -public class JavadocBlockTag { +public class JavadocBlockTag { /** * The type of tag: it could either correspond to a known tag (param, return, etc.) or represent * an unknown tag. */ - public enum Type { + public enum Type { + AUTHOR, DEPRECATED, EXCEPTION, @@ -85,7 +85,7 @@ static Type fromName(String tagName) { private String tagName; - public JavadocBlockTag(Type type, String content) { + public JavadocBlockTag(Type type, String content) { this.type = type; this.tagName = type.keyword; if (type.hasName()) { @@ -95,7 +95,7 @@ public JavadocBlockTag(Type type, String content) { this.content = JavadocDescription.parseText(content); } - public JavadocBlockTag(String tagName, String content) { + public JavadocBlockTag(String tagName, String content) { this(Type.fromName(tagName), content); this.tagName = tagName; } @@ -104,23 +104,23 @@ public static JavadocBlockTag createParamBlockTag(String paramName, String conte return new JavadocBlockTag(Type.PARAM, paramName + " " + content); } - public Type getType() { + public Type getType() { return type; } - public JavadocDescription getContent() { + public JavadocDescription getContent() { return content; } - public Optional getName() { + public Optional getName() { return name; } - public String getTagName() { + public String getTagName() { return tagName; } - public String toText() { + public String toText() { StringBuilder sb = new StringBuilder(); sb.append("@"); sb.append(tagName); @@ -133,17 +133,21 @@ public String toText() { } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; JavadocBlockTag that = (JavadocBlockTag) o; - if (type != that.type) return false; - if (!content.equals(that.content)) return false; + if (type != that.type) + return false; + if (!content.equals(that.content)) + return false; return name.equals(that.name); } @Override - public int hashCode() { + public int hashCode() { int result = type.hashCode(); result = 31 * result + content.hashCode(); result = 31 * result + name.hashCode(); @@ -151,7 +155,7 @@ public int hashCode() { } @Override - public String toString() { + public String toString() { return "JavadocBlockTag{" + "type=" + type + ", content='" + content + '\'' + ", name=" + name + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java index cc3fbc5817..f49d1cec87 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java @@ -29,7 +29,7 @@ *

    * For example This class is totally unrelated to {@link com.github.javaparser.Range} */ -public class JavadocDescription { +public class JavadocDescription { private List elements; @@ -63,48 +63,50 @@ private static Pair indexOfNextInlineTag(String text, int star return new Pair<>(index, closeIndex); } - public JavadocDescription() { + public JavadocDescription() { elements = new LinkedList<>(); } - public JavadocDescription(List elements) { + public JavadocDescription(List elements) { this(); this.elements.addAll(elements); } - public boolean addElement(JavadocDescriptionElement element) { + public boolean addElement(JavadocDescriptionElement element) { return this.elements.add(element); } - public List getElements() { + public List getElements() { return this.elements; } - public String toText() { + public String toText() { StringBuilder sb = new StringBuilder(); elements.forEach(e -> sb.append(e.toText())); return sb.toString(); } - public boolean isEmpty() { + public boolean isEmpty() { return toText().isEmpty(); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; JavadocDescription that = (JavadocDescription) o; return elements.equals(that.elements); } @Override - public int hashCode() { + public int hashCode() { return elements.hashCode(); } @Override - public String toString() { + public String toString() { return "JavadocDescription{" + "elements=" + elements + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescriptionElement.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescriptionElement.java index fed7e85917..f746c556ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescriptionElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescriptionElement.java @@ -25,7 +25,7 @@ *

    * So for example {@code a text} or {@link String} could be valid description elements. */ -public interface JavadocDescriptionElement { +public interface JavadocDescriptionElement { String toText(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java index 1d72e4d551..fcd1a9d293 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java @@ -28,7 +28,7 @@ *

    * For example {@link String} */ -public class JavadocInlineTag implements JavadocDescriptionElement { +public class JavadocInlineTag implements JavadocDescriptionElement { public static JavadocDescriptionElement fromText(String text) { if (!text.startsWith("{@")) { @@ -48,7 +48,8 @@ public static JavadocDescriptionElement fromText(String text) { * The type of tag: it could either correspond to a known tag (code, docRoot, etc.) or represent * an unknown tag. */ - public enum Type { + public enum Type { + CODE, DOC_ROOT, INHERIT_DOC, @@ -81,41 +82,45 @@ static JavadocInlineTag.Type fromName(String tagName) { private String content; - public JavadocInlineTag(String tagName, Type type, String content) { + public JavadocInlineTag(String tagName, Type type, String content) { this.tagName = tagName; this.type = type; this.content = content; } - public Type getType() { + public Type getType() { return type; } - public String getContent() { + public String getContent() { return content; } - public String getName() { + public String getName() { return tagName; } @Override - public String toText() { + public String toText() { return "{@" + tagName + this.content + "}"; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; JavadocInlineTag that = (JavadocInlineTag) o; - if (tagName != null ? !tagName.equals(that.tagName) : that.tagName != null) return false; - if (type != that.type) return false; + if (tagName != null ? !tagName.equals(that.tagName) : that.tagName != null) + return false; + if (type != that.type) + return false; return content != null ? content.equals(that.content) : that.content == null; } @Override - public int hashCode() { + public int hashCode() { int result = tagName != null ? tagName.hashCode() : 0; result = 31 * result + (type != null ? type.hashCode() : 0); result = 31 * result + (content != null ? content.hashCode() : 0); @@ -123,8 +128,7 @@ public int hashCode() { } @Override - public String toString() { - return "JavadocInlineTag{" + "tagName='" + tagName + '\'' + ", type=" + type + ", content='" + content + '\'' - + '}'; + public String toString() { + return "JavadocInlineTag{" + "tagName='" + tagName + '\'' + ", type=" + type + ", content='" + content + '\'' + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java index ca2d498295..5511bc4593 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java +++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java @@ -26,11 +26,11 @@ * For example in A class totally unrelated to {@link String}, I swear! we would have two snippets: one * before and one after the inline tag ({@link String}). */ -public class JavadocSnippet implements JavadocDescriptionElement { +public class JavadocSnippet implements JavadocDescriptionElement { private String text; - public JavadocSnippet(String text) { + public JavadocSnippet(String text) { if (text == null) { throw new NullPointerException(); } @@ -38,25 +38,27 @@ public JavadocSnippet(String text) { } @Override - public String toText() { + public String toText() { return this.text; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; JavadocSnippet that = (JavadocSnippet) o; return text.equals(that.text); } @Override - public int hashCode() { + public int hashCode() { return text.hashCode(); } @Override - public String toString() { + public String toString() { return "JavadocSnippet{" + "text='" + text + '\'' + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java b/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java index 2a71a69903..d8b3658818 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java @@ -15,7 +15,7 @@ * @author Alexander Weigl * @version 1 (2/26/21) */ -public class Example { +public class Example { public static void main(String[] args) throws FileNotFoundException { /*GeneratedJavaParserTokenManager manager = new GeneratedJavaParserTokenManager( diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocHardRemover.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocHardRemover.java index ddf9251094..5fe6aea60c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocHardRemover.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocHardRemover.java @@ -22,10 +22,10 @@ * @author Alexander Weigl * @version 1 (2/1/22) */ -public class JmlDocHardRemover extends Processor { +public class JmlDocHardRemover extends Processor { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (configuration.isProcessJml()) { final Optional r = result.getResult(); final Optional comments = result.getCommentsCollection(); @@ -44,19 +44,19 @@ public static class JmlDocCollectorVisitor extends ModifierVisitor { private final List docs = new LinkedList<>(); @Override - public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) { + public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) { docs.add(n); return n; } @Override - public Visitable visit(JmlDocStmt n, Void arg) { + public Visitable visit(JmlDocStmt n, Void arg) { docs.add(n); return n; } @Override - public Visitable visit(Modifier n, Void arg) { + public Visitable visit(Modifier n, Void arg) { if (n.getKeyword() instanceof JmlDocModifier) { docs.add(n); } @@ -64,7 +64,7 @@ public Visitable visit(Modifier n, Void arg) { } @Override - public JmlDocType visit(JmlDocType n, Void arg) { + public JmlDocType visit(JmlDocType n, Void arg) { docs.add(n); return n; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java index 108d95920a..da7dbaca0d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java @@ -15,13 +15,13 @@ * @author Alexander Weigl * @version 1 (11/23/21) */ -public record JmlDocSanitizer(Set enabledKeys) { +public record JmlDocSanitizer(Set enabledKeys) { - public String asString(NodeList jmlDocs) { + public String asString(NodeList jmlDocs) { return asString(jmlDocs, true); } - public String asStringJT(Collection jmlDocs, boolean emulateGlobalPosition) { + public String asStringJT(Collection jmlDocs, boolean emulateGlobalPosition) { if (jmlDocs.isEmpty()) return ""; StringConstructor s = new StringConstructor(); @@ -40,7 +40,7 @@ public String asStringJT(Collection jmlDocs, boolean emulateGlobalPos return toSanitizedString(s.getBuffer()); } - public String asString(Collection jmlDocs, boolean emulateGlobalPosition) { + public String asString(Collection jmlDocs, boolean emulateGlobalPosition) { if (jmlDocs.isEmpty()) return ""; StringConstructor s = new StringConstructor(); @@ -55,11 +55,11 @@ public String asString(Collection jmlDocs, boolean emulateGlobalPosition) return toSanitizedString(s.getBuffer()); } - public String asString(NodeList jmlDocs, boolean emulateGlobalPosition) { + public String asString(NodeList jmlDocs, boolean emulateGlobalPosition) { return asStringJT(jmlDocs.stream().map(JmlDoc::getContent).toList(), emulateGlobalPosition); } - public String toSanitizedString(StringBuilder s) { + public String toSanitizedString(StringBuilder s) { cleanComments(s); cleanAtSigns(s); return s.toString(); @@ -184,7 +184,7 @@ public static boolean isActiveJmlSpec(Collection activeKeys, String[] ke return (!plusKeyFound || enabledPlusKeyFound) && !enabledNegativeKeyFound; } - public boolean isActiveJmlSpec(String[] keys) { + public boolean isActiveJmlSpec(String[] keys) { return isActiveJmlSpec(enabledKeys, keys); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java index 128417842b..c9dd872f33 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java @@ -42,10 +42,10 @@ * @see ParserConfiguration#isProcessJml() * @see ParserConfiguration#getJmlKeys() */ -public class JmlProcessor extends Processor { +public class JmlProcessor extends Processor { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (configuration.isProcessJml()) { final Optional r = result.getResult(); final Optional comments = result.getCommentsCollection(); @@ -137,7 +137,7 @@ private ArbitraryNodeContainer parseJmlModifierLevel(NodeList jmlDocs) { } @Override - public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) { + public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) { processedJmlDoc.add(n); ArbitraryNodeContainer t = parseJmlClasslevel(n.getJmlComments()); if (t != null) { @@ -178,7 +178,7 @@ public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) { } @Override - public Visitable visit(JmlDocType n, Void arg) { + public Visitable visit(JmlDocType n, Void arg) { processedJmlDoc.add(n); ArbitraryNodeContainer t = parseJmlTypeLevel(n.getJmlComments()); if (t != null) { @@ -201,7 +201,7 @@ public Visitable visit(JmlDocType n, Void arg) { } @Override - public BlockStmt visit(BlockStmt n, Void arg) { + public BlockStmt visit(BlockStmt n, Void arg) { n.getContracts().accept(this, arg); for (int pos = 0; pos < n.getStatements().size(); pos++) { Statement s = n.getStatement(pos); @@ -266,7 +266,7 @@ private int handleJmlStatementLevel(BlockStmt p, JmlDocStmt n, int pos) { } @Override - public Visitable visit(Modifier n, Void arg) { + public Visitable visit(Modifier n, Void arg) { if (n.getKeyword() instanceof JmlDocModifier) { handleModifier(n); return null; diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java index fb4cc07b89..7ecd98de17 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java @@ -17,7 +17,7 @@ * @author Alexander Weigl * @version 1 (13.10.22) */ -public class JmlUtility { +public class JmlUtility { public static void fixRangeContracts(@NotNull NodeWithContracts n) { Preconditions.checkNotNull(n, "Parameter n can't be null."); @@ -46,7 +46,7 @@ class NodeSpliterator implements Spliterator { private final Queue toSupply = new LinkedList<>(); - public NodeSpliterator(Node node) { + public NodeSpliterator(Node node) { toExplore.add(node); } @@ -59,7 +59,7 @@ private void explore() { } @Override - public boolean tryAdvance(Consumer action) { + public boolean tryAdvance(Consumer action) { if (toSupply.isEmpty()) { explore(); } @@ -71,7 +71,7 @@ public boolean tryAdvance(Consumer action) { } @Override - public Spliterator trySplit() { + public Spliterator trySplit() { if (!toExplore.isEmpty()) { return new NodeSpliterator(toExplore.poll()); } @@ -79,12 +79,12 @@ public Spliterator trySplit() { } @Override - public long estimateSize() { + public long estimateSize() { return 64; } @Override - public int characteristics() { + public int characteristics() { return Spliterator.NONNULL | Spliterator.IMMUTABLE; } } @@ -95,12 +95,12 @@ class NodeIterator implements Iterator { private final Queue toSupply = new LinkedList<>(); - public NodeIterator(Node node) { + public NodeIterator(Node node) { toExplore.add(node); } @Override - public Node next() { + public Node next() { if (toSupply.isEmpty()) { explore(); } @@ -110,7 +110,7 @@ public Node next() { } @Override - public boolean hasNext() { + public boolean hasNext() { return !toSupply.isEmpty() || !toExplore.isEmpty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java index c4d3441d5d..f8693c0535 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java @@ -17,10 +17,10 @@ * @author Alexander Weigl * @version 1 (2/1/22) */ -public class JmlWarnRemaingJmlDoc extends Processor { +public class JmlWarnRemaingJmlDoc extends Processor { @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (configuration.isProcessJml()) { final Optional r = result.getResult(); final Optional comments = result.getCommentsCollection(); @@ -36,30 +36,30 @@ public static class JmlWarnRemainingJmlDocVisitor extends GenericVisitorAdapter< private final ProblemReporter problems; - public JmlWarnRemainingJmlDocVisitor(List problems) { + public JmlWarnRemainingJmlDocVisitor(List problems) { this.problems = new ProblemReporter(problems::add); } @Override - public Void visit(JmlDocDeclaration n, Void arg) { + public Void visit(JmlDocDeclaration n, Void arg) { problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName()); return null; } @Override - public Void visit(JmlDocStmt n, Void arg) { + public Void visit(JmlDocStmt n, Void arg) { problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName()); return null; } @Override - public Void visit(JmlDoc n, Void arg) { + public Void visit(JmlDoc n, Void arg) { problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName()); return null; } @Override - public Void visit(Modifier n, Void arg) { + public Void visit(Modifier n, Void arg) { if (n.getKeyword() instanceof JmlDocModifier) { problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName()); } @@ -67,7 +67,7 @@ public Void visit(Modifier n, Void arg) { } @Override - public Void visit(JmlDocType n, Void arg) { + public Void visit(JmlDocType n, Void arg) { problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName()); return null; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/StringConstructor.java b/javaparser-core/src/main/java/com/github/javaparser/jml/StringConstructor.java index c91898678e..46841b4224 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/StringConstructor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/StringConstructor.java @@ -1,6 +1,6 @@ package com.github.javaparser.jml; -public class StringConstructor { +public class StringConstructor { private final StringBuilder sb = new StringBuilder(1024); @@ -9,7 +9,7 @@ public class StringConstructor { private int curColumn = 1; - public StringConstructor append(String value) { + public StringConstructor append(String value) { sb.ensureCapacity(sb.length() + value.length() + 1); for (char c : value.toCharArray()) { sb.append(c); @@ -23,7 +23,7 @@ public StringConstructor append(String value) { return this; } - public StringConstructor expandTo(int line, int column) { + public StringConstructor expandTo(int line, int column) { if (curLine > line || (curLine == line && curColumn > column)) { throw new IllegalArgumentException(); } @@ -38,11 +38,11 @@ public StringConstructor expandTo(int line, int column) { } @Override - public String toString() { + public String toString() { return sb.toString(); } - public StringBuilder getBuffer() { + public StringBuilder getBuffer() { return sb; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationConfiguration.java index 705b3677be..fae233a33b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationConfiguration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationConfiguration.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -public class JmlAnnotationConfiguration { +public class JmlAnnotationConfiguration { public static final String NOT_NULL = "org.jetbrains.annotations.NotNull"; @@ -14,7 +14,7 @@ public class JmlAnnotationConfiguration { private final Map annotationToModifier = new HashMap<>(); - public Map getAnnotationToModifier() { + public Map getAnnotationToModifier() { return annotationToModifier; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java index 94222fc2e4..f16a662cc1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java +++ b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java @@ -19,16 +19,16 @@ * @author Alexander Weigl * @version 1 (4/10/20) */ -public class JmlAnnotationSupport extends Processor { +public class JmlAnnotationSupport extends Processor { public final JmlAnnotationConfiguration configuration; - public JmlAnnotationSupport(JmlAnnotationConfiguration configuration) { + public JmlAnnotationSupport(JmlAnnotationConfiguration configuration) { this.configuration = configuration; } @Override - public void postProcess(ParseResult result, ParserConfiguration configuration) { + public void postProcess(ParseResult result, ParserConfiguration configuration) { if (result.isSuccessful()) { Map a2m = JmlAnnotationSupport.this.configuration.getAnnotationToModifier(); TreeVisitor visitor = new JmlAnnotationTranslator(a2m, result.getProblems()); @@ -43,13 +43,13 @@ class JmlAnnotationTranslator extends TreeVisitor { private final ProblemReporter problemReport; - public JmlAnnotationTranslator(Map a2m, List problems) { + public JmlAnnotationTranslator(Map a2m, List problems) { this.a2m = a2m; problemReport = new ProblemReporter(problems::add); } @Override - public void process(Node node) { + public void process(Node node) { if (node instanceof NodeWithAnnotations) { NodeWithAnnotations n = (NodeWithAnnotations) node; for (AnnotationExpr annotation : n.getAnnotations()) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java index c0916a5682..14c8e47ac7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.AnnotationDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.AnnotationDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class AnnotationDeclarationMetaModel extends TypeDeclarationMetaModel { +public class AnnotationDeclarationMetaModel extends TypeDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") AnnotationDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - AnnotationDeclaration.class, - "AnnotationDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, AnnotationDeclaration.class, "AnnotationDeclaration", "com.github.javaparser.ast.body", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java index c3bc512536..dd29a20cb5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.expr.AnnotationExpr; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.expr.AnnotationExpr; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,29 +35,17 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class AnnotationExprMetaModel extends ExpressionMetaModel { +public class AnnotationExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") AnnotationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - AnnotationExpr.class, - "AnnotationExpr", - "com.github.javaparser.ast.expr", - true, - false); + super(superBaseNodeMetaModel, AnnotationExpr.class, "AnnotationExpr", "com.github.javaparser.ast.expr", true, false); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected AnnotationExprMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected AnnotationExprMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java index c603478fe7..4a244c7ab5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.AnnotationMemberDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.AnnotationMemberDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class AnnotationMemberDeclarationMetaModel extends BodyDeclarationMetaModel { +public class AnnotationMemberDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") AnnotationMemberDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - AnnotationMemberDeclaration.class, - "AnnotationMemberDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, AnnotationMemberDeclaration.class, "AnnotationMemberDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel defaultValuePropertyMetaModel; + public PropertyMetaModel defaultValuePropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java index 7ce2a3aa9a..2870c91a4b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ArrayAccessExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ArrayAccessExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ArrayAccessExprMetaModel extends ExpressionMetaModel { +public class ArrayAccessExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ArrayAccessExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ArrayAccessExpr.class, - "ArrayAccessExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, ArrayAccessExpr.class, "ArrayAccessExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel indexPropertyMetaModel; + public PropertyMetaModel indexPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java index e60fc3be8f..fda84c5643 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ArrayCreationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ArrayCreationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ArrayCreationExprMetaModel extends ExpressionMetaModel { +public class ArrayCreationExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ArrayCreationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ArrayCreationExpr.class, - "ArrayCreationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, ArrayCreationExpr.class, "ArrayCreationExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel elementTypePropertyMetaModel; + public PropertyMetaModel elementTypePropertyMetaModel; - public PropertyMetaModel initializerPropertyMetaModel; + public PropertyMetaModel initializerPropertyMetaModel; - public PropertyMetaModel levelsPropertyMetaModel; + public PropertyMetaModel levelsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java index 92eda1ae8c..5d22a09576 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; import com.github.javaparser.ast.ArrayCreationLevel; import com.github.javaparser.ast.Generated; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ArrayCreationLevelMetaModel extends NodeMetaModel { +public class ArrayCreationLevelMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ArrayCreationLevelMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ArrayCreationLevel.class, - "ArrayCreationLevel", - "com.github.javaparser.ast", - false, - false); + super(superBaseNodeMetaModel, ArrayCreationLevel.class, "ArrayCreationLevel", "com.github.javaparser.ast", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel dimensionPropertyMetaModel; + public PropertyMetaModel dimensionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java index 3cc4196b7f..5b86923e45 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ArrayInitializerExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ArrayInitializerExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ArrayInitializerExprMetaModel extends ExpressionMetaModel { +public class ArrayInitializerExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ArrayInitializerExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ArrayInitializerExpr.class, - "ArrayInitializerExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, ArrayInitializerExpr.class, "ArrayInitializerExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel valuesPropertyMetaModel; + public PropertyMetaModel valuesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java index da951e3fb7..1a8c9bb5ff 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.ArrayType; import java.util.Optional; +import com.github.javaparser.ast.type.ArrayType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ArrayTypeMetaModel extends ReferenceTypeMetaModel { +public class ArrayTypeMetaModel extends ReferenceTypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ArrayTypeMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ArrayType.class, "ArrayType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel componentTypePropertyMetaModel; + public PropertyMetaModel componentTypePropertyMetaModel; - public PropertyMetaModel originPropertyMetaModel; + public PropertyMetaModel originPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java index 6c3047816d..ad939ceacb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.AssertStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.AssertStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class AssertStmtMetaModel extends StatementMetaModel { +public class AssertStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") AssertStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, AssertStmt.class, "AssertStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel checkPropertyMetaModel; + public PropertyMetaModel checkPropertyMetaModel; - public PropertyMetaModel messagePropertyMetaModel; + public PropertyMetaModel messagePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java index 00310dccc5..291cb96fd0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.AssignExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.AssignExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class AssignExprMetaModel extends ExpressionMetaModel { +public class AssignExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") AssignExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, AssignExpr.class, "AssignExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel operatorPropertyMetaModel; + public PropertyMetaModel operatorPropertyMetaModel; - public PropertyMetaModel targetPropertyMetaModel; + public PropertyMetaModel targetPropertyMetaModel; - public PropertyMetaModel valuePropertyMetaModel; + public PropertyMetaModel valuePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java index 34cf34fc58..f77d9d151a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java @@ -21,7 +21,6 @@ package com.github.javaparser.metamodel; import static com.github.javaparser.utils.Utils.decapitalize; - import com.github.javaparser.ast.AllFieldsConstructor; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; @@ -55,13 +54,7 @@ public abstract class BaseNodeMetaModel { private final boolean hasWildcard; - public BaseNodeMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + public BaseNodeMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { this.superNodeMetaModel = superNodeMetaModel; this.type = type; this.name = name; @@ -73,14 +66,14 @@ public BaseNodeMetaModel( /** * @return is this the meta model for this node class? */ - public boolean is(Class c) { + public boolean is(Class c) { return type.equals(c); } /** * @return package name + class name */ - public String getQualifiedClassName() { + public String getQualifiedClassName() { return packageName + "." + name; } @@ -88,7 +81,7 @@ public String getQualifiedClassName() { * @return the meta model for the node that this node extends. Note that this is to be used to find properties * defined in superclasses of a Node. */ - public Optional getSuperNodeMetaModel() { + public Optional getSuperNodeMetaModel() { return superNodeMetaModel; } @@ -96,11 +89,11 @@ public Optional getSuperNodeMetaModel() { * @return a list of all properties declared directly in this node (not its parent nodes.) These are also available * as fields. */ - public List getDeclaredPropertyMetaModels() { + public List getDeclaredPropertyMetaModels() { return declaredPropertyMetaModels; } - public List getDerivedPropertyMetaModels() { + public List getDerivedPropertyMetaModels() { return derivedPropertyMetaModels; } @@ -108,7 +101,7 @@ public List getDerivedPropertyMetaModels() { * @return a list of all properties that describe the parameters to the all-fields (but not "range" and "comment") * constructor, in the order of appearance in the constructor parameter list. */ - public List getConstructorParameters() { + public List getConstructorParameters() { return constructorParameters; } @@ -116,7 +109,7 @@ public List getConstructorParameters() { * @return a list of all properties in this node and its parents. Note that a new list is created every time this * method is called. */ - public List getAllPropertyMetaModels() { + public List getAllPropertyMetaModels() { List allPropertyMetaModels = new ArrayList<>(getDeclaredPropertyMetaModels()); BaseNodeMetaModel walkNode = this; while (walkNode.getSuperNodeMetaModel().isPresent()) { @@ -126,7 +119,7 @@ public List getAllPropertyMetaModels() { return allPropertyMetaModels; } - public boolean isInstanceOfMetaModel(BaseNodeMetaModel baseMetaModel) { + public boolean isInstanceOfMetaModel(BaseNodeMetaModel baseMetaModel) { if (this == baseMetaModel) { return true; } @@ -139,61 +132,64 @@ public boolean isInstanceOfMetaModel(BaseNodeMetaModel baseMetaModel) { /** * @return the class for this AST node type. */ - public Class getType() { + public Class getType() { return type; } /** * @return the package containing this AST node class. */ - public String getPackageName() { + public String getPackageName() { return packageName; } /** * @return whether this AST node is abstract. */ - public boolean isAbstract() { + public boolean isAbstract() { return isAbstract; } /** * @return whether this AST node has a <?> at the end of its type. */ - public boolean hasWildcard() { + public boolean hasWildcard() { return hasWildcard; } /** * @return whether this AST node is the root node, meaning that it is the meta model for "Node": "NodeMetaModel". */ - public boolean isRootNode() { + public boolean isRootNode() { return !superNodeMetaModel.isPresent(); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; BaseNodeMetaModel classMetaModel = (BaseNodeMetaModel) o; - if (!type.equals(classMetaModel.type)) return false; + if (!type.equals(classMetaModel.type)) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { return type.hashCode(); } @Override - public String toString() { + public String toString() { return name; } /** * @return the type name, with generics. */ - public String getTypeNameGenerified() { + public String getTypeNameGenerified() { if (hasWildcard) { return getTypeName() + ""; } @@ -203,14 +199,14 @@ public String getTypeNameGenerified() { /** * @return the raw type name, so nothing but the name. */ - public String getTypeName() { + public String getTypeName() { return type.getSimpleName(); } /** * The name of the field in JavaParserMetaModel for this node meta model. */ - public String getMetaModelFieldName() { + public String getMetaModelFieldName() { return decapitalize(getClass().getSimpleName()); } @@ -220,7 +216,7 @@ public String getMetaModelFieldName() { * @param parameters a map of propertyName -> value. * This should at least contain a pair for every required property for this node. */ - public Node construct(Map parameters) { + public Node construct(Map parameters) { for (Constructor constructor : getType().getConstructors()) { if (constructor.getAnnotation(AllFieldsConstructor.class) != null) { try { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java index bb17fd1713..04562febd7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.BinaryExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.BinaryExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BinaryExprMetaModel extends ExpressionMetaModel { +public class BinaryExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BinaryExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, BinaryExpr.class, "BinaryExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel leftPropertyMetaModel; + public PropertyMetaModel leftPropertyMetaModel; - public PropertyMetaModel operatorPropertyMetaModel; + public PropertyMetaModel operatorPropertyMetaModel; - public PropertyMetaModel rightPropertyMetaModel; + public PropertyMetaModel rightPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java index fd94dcb4f1..e0b18a7c15 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.comments.BlockComment; import java.util.Optional; +import com.github.javaparser.ast.comments.BlockComment; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BlockCommentMetaModel extends CommentMetaModel { +public class BlockCommentMetaModel extends CommentMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BlockCommentMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - BlockComment.class, - "BlockComment", - "com.github.javaparser.ast.comments", - false, - false); + super(superBaseNodeMetaModel, BlockComment.class, "BlockComment", "com.github.javaparser.ast.comments", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java index ea433840a3..8f6df1263e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.BlockStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.BlockStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BlockStmtMetaModel extends StatementMetaModel { +public class BlockStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BlockStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, BlockStmt.class, "BlockStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel statementsPropertyMetaModel; + public PropertyMetaModel contractsPropertyMetaModel; + + public PropertyMetaModel statementsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java index 0d727566ab..bc3a5ee6c1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.body.BodyDeclaration; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.body.BodyDeclaration; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,29 +35,17 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BodyDeclarationMetaModel extends NodeMetaModel { +public class BodyDeclarationMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BodyDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - BodyDeclaration.class, - "BodyDeclaration", - "com.github.javaparser.ast.body", - true, - true); + super(superBaseNodeMetaModel, BodyDeclaration.class, "BodyDeclaration", "com.github.javaparser.ast.body", true, true); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected BodyDeclarationMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected BodyDeclarationMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java index b6eb1679f3..5e977b298d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.BooleanLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.BooleanLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BooleanLiteralExprMetaModel extends LiteralExprMetaModel { +public class BooleanLiteralExprMetaModel extends LiteralExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BooleanLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - BooleanLiteralExpr.class, - "BooleanLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, BooleanLiteralExpr.class, "BooleanLiteralExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel valuePropertyMetaModel; + public PropertyMetaModel valuePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java index 81973b3fa4..900dc3818d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.BreakStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.BreakStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BreakStmtMetaModel extends StatementMetaModel { +public class BreakStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BreakStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, BreakStmt.class, "BreakStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java index 65babea470..ff6b096ed7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class BreaksClauseMetaModel extends JmlClauseMetaModel { +public class BreaksClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") BreaksClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClauseLabel.class, "BreaksClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel exprPropertyMetaModel; + public PropertyMetaModel exprPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java index 58cb67abb5..697d33b9c7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CallableClauseMetaModel extends JmlClauseMetaModel { +public class CallableClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CallableClauseMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java index 7ee6ec9f65..a07416e01a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.body.CallableDeclaration; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.body.CallableDeclaration; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,39 +35,29 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CallableDeclarationMetaModel extends BodyDeclarationMetaModel { +public class CallableDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CallableDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - CallableDeclaration.class, - "CallableDeclaration", - "com.github.javaparser.ast.body", - true, - true); + super(superBaseNodeMetaModel, CallableDeclaration.class, "CallableDeclaration", "com.github.javaparser.ast.body", true, true); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected CallableDeclarationMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected CallableDeclarationMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel contractsPropertyMetaModel; + + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel parametersPropertyMetaModel; + public PropertyMetaModel parametersPropertyMetaModel; - public PropertyMetaModel receiverParameterPropertyMetaModel; + public PropertyMetaModel receiverParameterPropertyMetaModel; - public PropertyMetaModel thrownExceptionsPropertyMetaModel; + public PropertyMetaModel thrownExceptionsPropertyMetaModel; - public PropertyMetaModel typeParametersPropertyMetaModel; + public PropertyMetaModel typeParametersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java index b113ffee4c..ec5b220ff0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CallableMetaModel extends JmlClauseMetaModel { +public class CallableMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CallableMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java index a226f0a9dd..b180eae32c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.CastExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.CastExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CastExprMetaModel extends ExpressionMetaModel { +public class CastExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CastExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, CastExpr.class, "CastExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java index 19d3331302..b83fa11c4f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.CatchClause; import java.util.Optional; +import com.github.javaparser.ast.stmt.CatchClause; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CatchClauseMetaModel extends NodeMetaModel { +public class CatchClauseMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CatchClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, CatchClause.class, "CatchClause", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel parameterPropertyMetaModel; + public PropertyMetaModel parameterPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java index 0acda94722..bdb14ac7ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.CharLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.CharLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CharLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class CharLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CharLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - CharLiteralExpr.class, - "CharLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, CharLiteralExpr.class, "CharLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java index 098eb54fc8..b0925aeb31 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ClassExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ClassExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ClassExprMetaModel extends ExpressionMetaModel { +public class ClassExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ClassExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ClassExpr.class, "ClassExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java index 0a9691b68b..11f9288751 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ClassInvariantClauseMetaModel extends JmlClassLevelMetaModel { +public class ClassInvariantClauseMetaModel extends JmlClassLevelMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ClassInvariantClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClassExprDeclaration.class, "ClassInvariantClause", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel invariantPropertyMetaModel; + public PropertyMetaModel invariantPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java index b3106eed55..fba654515a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,26 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ClassOrInterfaceDeclarationMetaModel extends TypeDeclarationMetaModel { +public class ClassOrInterfaceDeclarationMetaModel extends TypeDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ClassOrInterfaceDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ClassOrInterfaceDeclaration.class, - "ClassOrInterfaceDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, ClassOrInterfaceDeclaration.class, "ClassOrInterfaceDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel extendedTypesPropertyMetaModel; + public PropertyMetaModel extendedTypesPropertyMetaModel; - public PropertyMetaModel implementedTypesPropertyMetaModel; + public PropertyMetaModel implementedTypesPropertyMetaModel; - public PropertyMetaModel isInterfacePropertyMetaModel; + public PropertyMetaModel isInterfacePropertyMetaModel; - public PropertyMetaModel permittedTypesPropertyMetaModel; + public PropertyMetaModel permittedTypesPropertyMetaModel; - public PropertyMetaModel typeParametersPropertyMetaModel; + public PropertyMetaModel typeParametersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java index 2f153f02ce..5949cb00f2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.ClassOrInterfaceType; import java.util.Optional; +import com.github.javaparser.ast.type.ClassOrInterfaceType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ClassOrInterfaceTypeMetaModel extends ReferenceTypeMetaModel { +public class ClassOrInterfaceTypeMetaModel extends ReferenceTypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ClassOrInterfaceTypeMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ClassOrInterfaceType.class, - "ClassOrInterfaceType", - "com.github.javaparser.ast.type", - false, - false); + super(superBaseNodeMetaModel, ClassOrInterfaceType.class, "ClassOrInterfaceType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel scopePropertyMetaModel; + public PropertyMetaModel scopePropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java index fb54122872..1f0a51f83f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.comments.Comment; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CommentMetaModel extends NodeMetaModel { +public class CommentMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CommentMetaModel(Optional superBaseNodeMetaModel) { @@ -43,15 +43,9 @@ public class CommentMetaModel extends NodeMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected CommentMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected CommentMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel contentPropertyMetaModel; + public PropertyMetaModel contentPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java index 13e48082f4..e9bab7579c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.CompactConstructorDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.CompactConstructorDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,26 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CompactConstructorDeclarationMetaModel extends BodyDeclarationMetaModel { +public class CompactConstructorDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CompactConstructorDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - CompactConstructorDeclaration.class, - "CompactConstructorDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, CompactConstructorDeclaration.class, "CompactConstructorDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel thrownExceptionsPropertyMetaModel; + public PropertyMetaModel thrownExceptionsPropertyMetaModel; - public PropertyMetaModel typeParametersPropertyMetaModel; + public PropertyMetaModel typeParametersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java index 65c73ea06d..8a761e7535 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Generated; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class CompilationUnitMetaModel extends NodeMetaModel { +public class CompilationUnitMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") CompilationUnitMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - CompilationUnit.class, - "CompilationUnit", - "com.github.javaparser.ast", - false, - false); + super(superBaseNodeMetaModel, CompilationUnit.class, "CompilationUnit", "com.github.javaparser.ast", false, false); } - public PropertyMetaModel importsPropertyMetaModel; + public PropertyMetaModel importsPropertyMetaModel; - public PropertyMetaModel modulePropertyMetaModel; + public PropertyMetaModel modulePropertyMetaModel; - public PropertyMetaModel packageDeclarationPropertyMetaModel; + public PropertyMetaModel packageDeclarationPropertyMetaModel; - public PropertyMetaModel typesPropertyMetaModel; + public PropertyMetaModel typesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java index 3e2dd7e15f..d5dbab4c7e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ConditionalExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ConditionalExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ConditionalExprMetaModel extends ExpressionMetaModel { +public class ConditionalExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ConditionalExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ConditionalExpr.class, - "ConditionalExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, ConditionalExpr.class, "ConditionalExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel conditionPropertyMetaModel; + public PropertyMetaModel conditionPropertyMetaModel; - public PropertyMetaModel elseExprPropertyMetaModel; + public PropertyMetaModel elseExprPropertyMetaModel; - public PropertyMetaModel thenExprPropertyMetaModel; + public PropertyMetaModel thenExprPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java index 73b67f3890..f1b92dba10 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.ConstructorDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.ConstructorDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ConstructorDeclarationMetaModel extends CallableDeclarationMetaModel { +public class ConstructorDeclarationMetaModel extends CallableDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ConstructorDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ConstructorDeclaration.class, - "ConstructorDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, ConstructorDeclaration.class, "ConstructorDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java index 43b89c7498..e10d0d371f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ContinueStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ContinueStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ContinueStmtMetaModel extends StatementMetaModel { +public class ContinueStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ContinueStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ContinueStmt.class, - "ContinueStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, ContinueStmt.class, "ContinueStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java index 3f83db7141..9e2a28b2e2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java @@ -22,7 +22,6 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -34,4 +33,5 @@ */ @Retention(RUNTIME) @Target(METHOD) -public @interface DerivedProperty {} +public @interface DerivedProperty { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java index 6bb50efad7..48b947671d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.DoStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.DoStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class DoStmtMetaModel extends StatementMetaModel { +public class DoStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") DoStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, DoStmt.class, "DoStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; + + public PropertyMetaModel conditionPropertyMetaModel; - public PropertyMetaModel conditionPropertyMetaModel; + public PropertyMetaModel contractsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java index 2024499caa..c551df633e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.DoubleLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.DoubleLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class DoubleLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class DoubleLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") DoubleLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - DoubleLiteralExpr.class, - "DoubleLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, DoubleLiteralExpr.class, "DoubleLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java index c3ec0f5b4f..0b35676222 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.EmptyStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.EmptyStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class EmptyStmtMetaModel extends StatementMetaModel { +public class EmptyStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") EmptyStmtMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java index 06a8fb0b89..888af08012 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.EnclosedExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.EnclosedExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class EnclosedExprMetaModel extends ExpressionMetaModel { +public class EnclosedExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") EnclosedExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - EnclosedExpr.class, - "EnclosedExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, EnclosedExpr.class, "EnclosedExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel innerPropertyMetaModel; + public PropertyMetaModel innerPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java index baf238ebe0..254f90900e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.EnumConstantDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.EnumConstantDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class EnumConstantDeclarationMetaModel extends BodyDeclarationMetaModel { +public class EnumConstantDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") EnumConstantDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - EnumConstantDeclaration.class, - "EnumConstantDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, EnumConstantDeclaration.class, "EnumConstantDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel argumentsPropertyMetaModel; + public PropertyMetaModel argumentsPropertyMetaModel; - public PropertyMetaModel classBodyPropertyMetaModel; + public PropertyMetaModel classBodyPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java index 9bad4e6d08..1a3650abd0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.EnumDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.EnumDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class EnumDeclarationMetaModel extends TypeDeclarationMetaModel { +public class EnumDeclarationMetaModel extends TypeDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") EnumDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - EnumDeclaration.class, - "EnumDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, EnumDeclaration.class, "EnumDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel entriesPropertyMetaModel; + public PropertyMetaModel entriesPropertyMetaModel; - public PropertyMetaModel implementedTypesPropertyMetaModel; + public PropertyMetaModel implementedTypesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java index 9ba9c4348f..6a0971527b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,26 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ExplicitConstructorInvocationStmtMetaModel extends StatementMetaModel { +public class ExplicitConstructorInvocationStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ExplicitConstructorInvocationStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ExplicitConstructorInvocationStmt.class, - "ExplicitConstructorInvocationStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, ExplicitConstructorInvocationStmt.class, "ExplicitConstructorInvocationStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel argumentsPropertyMetaModel; + public PropertyMetaModel argumentsPropertyMetaModel; - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel isThisPropertyMetaModel; + public PropertyMetaModel isThisPropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java index 2301de75f9..5962c9aaab 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.expr.Expression; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ExpressionMetaModel extends NodeMetaModel { +public class ExpressionMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ExpressionMetaModel(Optional superBaseNodeMetaModel) { @@ -43,13 +43,7 @@ public class ExpressionMetaModel extends NodeMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected ExpressionMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected ExpressionMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java index 48e7b8a9c9..45d0a03494 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ExpressionStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ExpressionStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ExpressionStmtMetaModel extends StatementMetaModel { +public class ExpressionStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ExpressionStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ExpressionStmt.class, - "ExpressionStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, ExpressionStmt.class, "ExpressionStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java index a187b928e5..7625ddec10 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.FieldAccessExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.FieldAccessExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class FieldAccessExprMetaModel extends ExpressionMetaModel { +public class FieldAccessExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") FieldAccessExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - FieldAccessExpr.class, - "FieldAccessExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, FieldAccessExpr.class, "FieldAccessExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel scopePropertyMetaModel; + public PropertyMetaModel scopePropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java index 180839d3de..7d23053514 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.FieldDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.FieldDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class FieldDeclarationMetaModel extends BodyDeclarationMetaModel { +public class FieldDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") FieldDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - FieldDeclaration.class, - "FieldDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, FieldDeclaration.class, "FieldDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; - public PropertyMetaModel maximumCommonTypePropertyMetaModel; + public PropertyMetaModel maximumCommonTypePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java index 0e6b3bdf3b..c91a7afa9f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ForEachStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ForEachStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ForEachStmtMetaModel extends StatementMetaModel { +public class ForEachStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ForEachStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ForEachStmt.class, "ForEachStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; + + public PropertyMetaModel contractsPropertyMetaModel; - public PropertyMetaModel iterablePropertyMetaModel; + public PropertyMetaModel iterablePropertyMetaModel; - public PropertyMetaModel variablePropertyMetaModel; + public PropertyMetaModel variablePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java index 65de155eab..58581c5a6a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ForStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ForStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ForStmtMetaModel extends StatementMetaModel { +public class ForStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ForStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ForStmt.class, "ForStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; + + public PropertyMetaModel comparePropertyMetaModel; - public PropertyMetaModel comparePropertyMetaModel; + public PropertyMetaModel contractsPropertyMetaModel; - public PropertyMetaModel initializationPropertyMetaModel; + public PropertyMetaModel initializationPropertyMetaModel; - public PropertyMetaModel updatePropertyMetaModel; + public PropertyMetaModel updatePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java index bd0d47e4a0..c9f9be6bba 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ForallClauseMetaModel extends JmlClauseMetaModel { +public class ForallClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ForallClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlForallClause.class, "ForallClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java index 1a055b6f61..eb254c92ba 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.IfStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.IfStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,24 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class IfStmtMetaModel extends StatementMetaModel { +public class IfStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") IfStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, IfStmt.class, "IfStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel conditionPropertyMetaModel; + public PropertyMetaModel conditionPropertyMetaModel; - public PropertyMetaModel elseStmtPropertyMetaModel; + public PropertyMetaModel elseStmtPropertyMetaModel; - public PropertyMetaModel thenStmtPropertyMetaModel; + public PropertyMetaModel thenStmtPropertyMetaModel; - public PropertyMetaModel cascadingIfStmtPropertyMetaModel; + public PropertyMetaModel cascadingIfStmtPropertyMetaModel; - public PropertyMetaModel elseBlockPropertyMetaModel; + public PropertyMetaModel elseBlockPropertyMetaModel; - public PropertyMetaModel elseBranchPropertyMetaModel; + public PropertyMetaModel elseBranchPropertyMetaModel; - public PropertyMetaModel thenBlockPropertyMetaModel; + public PropertyMetaModel thenBlockPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java index 5ed94b2385..04080b033d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.ImportDeclaration; import java.util.Optional; +import com.github.javaparser.ast.ImportDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ImportDeclarationMetaModel extends NodeMetaModel { +public class ImportDeclarationMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ImportDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ImportDeclaration.class, - "ImportDeclaration", - "com.github.javaparser.ast", - false, - false); + super(superBaseNodeMetaModel, ImportDeclaration.class, "ImportDeclaration", "com.github.javaparser.ast", false, false); } - public PropertyMetaModel isAsteriskPropertyMetaModel; + public PropertyMetaModel isAsteriskPropertyMetaModel; + + public PropertyMetaModel isJmlModelPropertyMetaModel; - public PropertyMetaModel isStaticPropertyMetaModel; + public PropertyMetaModel isStaticPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java index 259e73a5af..56b3fefa4b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.InitializerDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.InitializerDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class InitializerDeclarationMetaModel extends BodyDeclarationMetaModel { +public class InitializerDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") InitializerDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - InitializerDeclaration.class, - "InitializerDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, InitializerDeclaration.class, "InitializerDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel isStaticPropertyMetaModel; + public PropertyMetaModel isStaticPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java index 1780cd6c06..a6b9f11259 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.InstanceOfExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.InstanceOfExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class InstanceOfExprMetaModel extends ExpressionMetaModel { +public class InstanceOfExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") InstanceOfExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - InstanceOfExpr.class, - "InstanceOfExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, InstanceOfExpr.class, "InstanceOfExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel patternPropertyMetaModel; + public PropertyMetaModel patternPropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java index a8123a1beb..7ab32b0218 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.IntegerLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.IntegerLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class IntegerLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class IntegerLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") IntegerLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - IntegerLiteralExpr.class, - "IntegerLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, IntegerLiteralExpr.class, "IntegerLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java index f9c02ff05a..24d69a6748 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java @@ -22,7 +22,6 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -33,4 +32,5 @@ */ @Retention(RUNTIME) @Target(FIELD) -public @interface InternalProperty {} +public @interface InternalProperty { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java index f525be908a..3c14ed72a1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.IntersectionType; import java.util.Optional; +import com.github.javaparser.ast.type.IntersectionType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class IntersectionTypeMetaModel extends TypeMetaModel { +public class IntersectionTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") IntersectionTypeMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - IntersectionType.class, - "IntersectionType", - "com.github.javaparser.ast.type", - false, - false); + super(superBaseNodeMetaModel, IntersectionType.class, "IntersectionType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel elementsPropertyMetaModel; + public PropertyMetaModel elementsPropertyMetaModel; } 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 96608412ac..c2bcb8ad09 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 @@ -30,32 +30,22 @@ */ public final class JavaParserMetaModel { - private JavaParserMetaModel() {} + private JavaParserMetaModel() { + } private static final List nodeMetaModels = new ArrayList<>(); @Generated("com.github.javaparser.generator.metamodel.MetaModelGenerator") private static void initializeConstructorParameters() { bodyDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.modifiersPropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.parametersPropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); - callableDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel); typeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel); annotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel); referenceTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel); @@ -63,236 +53,113 @@ private static void initializeConstructorParameters() { typeDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); typeDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); typeDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); - literalStringValueExprMetaModel - .getConstructorParameters() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); - stringLiteralExprMetaModel - .getConstructorParameters() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); - moduleDeclarationMetaModel - .getConstructorParameters() - .add(moduleDeclarationMetaModel.annotationsPropertyMetaModel); + literalStringValueExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); + stringLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); + moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.annotationsPropertyMetaModel); moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.namePropertyMetaModel); moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.isOpenPropertyMetaModel); - moduleDeclarationMetaModel - .getConstructorParameters() - .add(moduleDeclarationMetaModel.directivesPropertyMetaModel); - arrayCreationLevelMetaModel - .getConstructorParameters() - .add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel); - arrayCreationLevelMetaModel - .getConstructorParameters() - .add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel); - compilationUnitMetaModel - .getConstructorParameters() - .add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel); + moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.directivesPropertyMetaModel); + arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel); + arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel); + compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel); compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.importsPropertyMetaModel); compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.typesPropertyMetaModel); compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.modulePropertyMetaModel); importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.namePropertyMetaModel); importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isStaticPropertyMetaModel); - importDeclarationMetaModel - .getConstructorParameters() - .add(importDeclarationMetaModel.isAsteriskPropertyMetaModel); + importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isAsteriskPropertyMetaModel); + importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isJmlModelPropertyMetaModel); modifierMetaModel.getConstructorParameters().add(modifierMetaModel.keywordPropertyMetaModel); - packageDeclarationMetaModel - .getConstructorParameters() - .add(packageDeclarationMetaModel.annotationsPropertyMetaModel); + packageDeclarationMetaModel.getConstructorParameters().add(packageDeclarationMetaModel.annotationsPropertyMetaModel); packageDeclarationMetaModel.getConstructorParameters().add(packageDeclarationMetaModel.namePropertyMetaModel); - annotationDeclarationMetaModel - .getConstructorParameters() - .add(typeDeclarationMetaModel.modifiersPropertyMetaModel); - annotationDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); + annotationDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); - annotationDeclarationMetaModel - .getConstructorParameters() - .add(typeDeclarationMetaModel.membersPropertyMetaModel); - annotationMemberDeclarationMetaModel - .getConstructorParameters() - .add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel); - annotationMemberDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - annotationMemberDeclarationMetaModel - .getConstructorParameters() - .add(annotationMemberDeclarationMetaModel.typePropertyMetaModel); - annotationMemberDeclarationMetaModel - .getConstructorParameters() - .add(annotationMemberDeclarationMetaModel.namePropertyMetaModel); - annotationMemberDeclarationMetaModel - .getConstructorParameters() - .add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(typeDeclarationMetaModel.modifiersPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(typeDeclarationMetaModel.namePropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel - .getConstructorParameters() - .add(typeDeclarationMetaModel.membersPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.modifiersPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.namePropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.parametersPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(constructorDeclarationMetaModel.bodyPropertyMetaModel); - constructorDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); - enumConstantDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - enumConstantDeclarationMetaModel - .getConstructorParameters() - .add(enumConstantDeclarationMetaModel.namePropertyMetaModel); - enumConstantDeclarationMetaModel - .getConstructorParameters() - .add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel); - enumConstantDeclarationMetaModel - .getConstructorParameters() - .add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel); + annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); + annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel); + annotationMemberDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.typePropertyMetaModel); + annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.namePropertyMetaModel); + annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(constructorDeclarationMetaModel.bodyPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel); + enumConstantDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.namePropertyMetaModel); + enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel); + enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel); enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); enumDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); - enumDeclarationMetaModel - .getConstructorParameters() - .add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel); + enumDeclarationMetaModel.getConstructorParameters().add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel); enumDeclarationMetaModel.getConstructorParameters().add(enumDeclarationMetaModel.entriesPropertyMetaModel); enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); fieldDeclarationMetaModel.getConstructorParameters().add(fieldDeclarationMetaModel.modifiersPropertyMetaModel); fieldDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); fieldDeclarationMetaModel.getConstructorParameters().add(fieldDeclarationMetaModel.variablesPropertyMetaModel); - initializerDeclarationMetaModel - .getConstructorParameters() - .add(initializerDeclarationMetaModel.isStaticPropertyMetaModel); - initializerDeclarationMetaModel - .getConstructorParameters() - .add(initializerDeclarationMetaModel.bodyPropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.modifiersPropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); + initializerDeclarationMetaModel.getConstructorParameters().add(initializerDeclarationMetaModel.isStaticPropertyMetaModel); + initializerDeclarationMetaModel.getConstructorParameters().add(initializerDeclarationMetaModel.bodyPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); methodDeclarationMetaModel.getConstructorParameters().add(methodDeclarationMetaModel.typePropertyMetaModel); methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.parametersPropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); methodDeclarationMetaModel.getConstructorParameters().add(methodDeclarationMetaModel.bodyPropertyMetaModel); - methodDeclarationMetaModel - .getConstructorParameters() - .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.modifiersPropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.annotationsPropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.typePropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.isVarArgsPropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.varArgsAnnotationsPropertyMetaModel); parameterMetaModel.getConstructorParameters().add(parameterMetaModel.namePropertyMetaModel); - receiverParameterMetaModel - .getConstructorParameters() - .add(receiverParameterMetaModel.annotationsPropertyMetaModel); + receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.annotationsPropertyMetaModel); receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.typePropertyMetaModel); receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.namePropertyMetaModel); recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); - recordDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + recordDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); - recordDeclarationMetaModel - .getConstructorParameters() - .add(recordDeclarationMetaModel.parametersPropertyMetaModel); - recordDeclarationMetaModel - .getConstructorParameters() - .add(recordDeclarationMetaModel.typeParametersPropertyMetaModel); - recordDeclarationMetaModel - .getConstructorParameters() - .add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel); + recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.parametersPropertyMetaModel); + recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.typeParametersPropertyMetaModel); + recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel); recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); - recordDeclarationMetaModel - .getConstructorParameters() - .add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(compactConstructorDeclarationMetaModel.namePropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel); - compactConstructorDeclarationMetaModel - .getConstructorParameters() - .add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel); + recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.namePropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel); variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.typePropertyMetaModel); variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.namePropertyMetaModel); - variableDeclaratorMetaModel - .getConstructorParameters() - .add(variableDeclaratorMetaModel.initializerPropertyMetaModel); + variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.initializerPropertyMetaModel); commentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel); blockCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel); javadocCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel); lineCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel); arrayAccessExprMetaModel.getConstructorParameters().add(arrayAccessExprMetaModel.namePropertyMetaModel); arrayAccessExprMetaModel.getConstructorParameters().add(arrayAccessExprMetaModel.indexPropertyMetaModel); - arrayCreationExprMetaModel - .getConstructorParameters() - .add(arrayCreationExprMetaModel.elementTypePropertyMetaModel); + arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.elementTypePropertyMetaModel); arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.levelsPropertyMetaModel); - arrayCreationExprMetaModel - .getConstructorParameters() - .add(arrayCreationExprMetaModel.initializerPropertyMetaModel); - arrayInitializerExprMetaModel - .getConstructorParameters() - .add(arrayInitializerExprMetaModel.valuesPropertyMetaModel); + arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.initializerPropertyMetaModel); + arrayInitializerExprMetaModel.getConstructorParameters().add(arrayInitializerExprMetaModel.valuesPropertyMetaModel); assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.targetPropertyMetaModel); assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.valuePropertyMetaModel); assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.operatorPropertyMetaModel); @@ -307,21 +174,15 @@ private static void initializeConstructorParameters() { conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.conditionPropertyMetaModel); conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.thenExprPropertyMetaModel); conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.elseExprPropertyMetaModel); - doubleLiteralExprMetaModel - .getConstructorParameters() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); + doubleLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); enclosedExprMetaModel.getConstructorParameters().add(enclosedExprMetaModel.innerPropertyMetaModel); fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.scopePropertyMetaModel); - fieldAccessExprMetaModel - .getConstructorParameters() - .add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel); + fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel); fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.namePropertyMetaModel); instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.expressionPropertyMetaModel); instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.typePropertyMetaModel); instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.patternPropertyMetaModel); - integerLiteralExprMetaModel - .getConstructorParameters() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); + integerLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.parametersPropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.bodyPropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel); @@ -333,54 +194,30 @@ private static void initializeConstructorParameters() { methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel); methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.namePropertyMetaModel); methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.argumentsPropertyMetaModel); - methodReferenceExprMetaModel - .getConstructorParameters() - .add(methodReferenceExprMetaModel.scopePropertyMetaModel); - methodReferenceExprMetaModel - .getConstructorParameters() - .add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel); - methodReferenceExprMetaModel - .getConstructorParameters() - .add(methodReferenceExprMetaModel.identifierPropertyMetaModel); + methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.scopePropertyMetaModel); + methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel); + methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.identifierPropertyMetaModel); nameExprMetaModel.getConstructorParameters().add(nameExprMetaModel.namePropertyMetaModel); nameMetaModel.getConstructorParameters().add(nameMetaModel.qualifierPropertyMetaModel); nameMetaModel.getConstructorParameters().add(nameMetaModel.identifierPropertyMetaModel); normalAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel); - normalAnnotationExprMetaModel - .getConstructorParameters() - .add(normalAnnotationExprMetaModel.pairsPropertyMetaModel); + normalAnnotationExprMetaModel.getConstructorParameters().add(normalAnnotationExprMetaModel.pairsPropertyMetaModel); objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.scopePropertyMetaModel); objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.typePropertyMetaModel); - objectCreationExprMetaModel - .getConstructorParameters() - .add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel); - objectCreationExprMetaModel - .getConstructorParameters() - .add(objectCreationExprMetaModel.argumentsPropertyMetaModel); - objectCreationExprMetaModel - .getConstructorParameters() - .add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel); + objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel); + objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.argumentsPropertyMetaModel); + objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel); patternExprMetaModel.getConstructorParameters().add(patternExprMetaModel.typePropertyMetaModel); - recordPatternExprMetaModel - .getConstructorParameters() - .add(recordPatternExprMetaModel.modifiersPropertyMetaModel); + recordPatternExprMetaModel.getConstructorParameters().add(recordPatternExprMetaModel.modifiersPropertyMetaModel); recordPatternExprMetaModel.getConstructorParameters().add(patternExprMetaModel.typePropertyMetaModel); - recordPatternExprMetaModel - .getConstructorParameters() - .add(recordPatternExprMetaModel.patternListPropertyMetaModel); - singleMemberAnnotationExprMetaModel - .getConstructorParameters() - .add(annotationExprMetaModel.namePropertyMetaModel); - singleMemberAnnotationExprMetaModel - .getConstructorParameters() - .add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel); + recordPatternExprMetaModel.getConstructorParameters().add(recordPatternExprMetaModel.patternListPropertyMetaModel); + singleMemberAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel); + singleMemberAnnotationExprMetaModel.getConstructorParameters().add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel); simpleNameMetaModel.getConstructorParameters().add(simpleNameMetaModel.identifierPropertyMetaModel); superExprMetaModel.getConstructorParameters().add(superExprMetaModel.typeNamePropertyMetaModel); switchExprMetaModel.getConstructorParameters().add(switchExprMetaModel.selectorPropertyMetaModel); switchExprMetaModel.getConstructorParameters().add(switchExprMetaModel.entriesPropertyMetaModel); - textBlockLiteralExprMetaModel - .getConstructorParameters() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); + textBlockLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); thisExprMetaModel.getConstructorParameters().add(thisExprMetaModel.typeNamePropertyMetaModel); typeExprMetaModel.getConstructorParameters().add(typeExprMetaModel.typePropertyMetaModel); typePatternExprMetaModel.getConstructorParameters().add(typePatternExprMetaModel.modifiersPropertyMetaModel); @@ -388,55 +225,65 @@ private static void initializeConstructorParameters() { typePatternExprMetaModel.getConstructorParameters().add(typePatternExprMetaModel.namePropertyMetaModel); unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.expressionPropertyMetaModel); unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.operatorPropertyMetaModel); - variableDeclarationExprMetaModel - .getConstructorParameters() - .add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel); - variableDeclarationExprMetaModel - .getConstructorParameters() - .add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel); - variableDeclarationExprMetaModel - .getConstructorParameters() - .add(variableDeclarationExprMetaModel.variablesPropertyMetaModel); + variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel); + variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel); + variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.variablesPropertyMetaModel); + jmlDocMetaModel.getConstructorParameters().add(jmlDocMetaModel.contentPropertyMetaModel); + jmlDocDeclarationMetaModel.getConstructorParameters().add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel); + jmlDocStmtMetaModel.getConstructorParameters().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel); + jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); + jmlDocTypeMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel); + jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel); + jmlDocTypeMetaModel.getConstructorParameters().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel); + jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel); + jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel); + jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel); + jmlTypeExprMetaModel.getConstructorParameters().add(jmlTypeExprMetaModel.typePropertyMetaModel); + jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel); + jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel); + jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel); + jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.variablesPropertyMetaModel); + jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.bodyPropertyMetaModel); + jmlMultiCompareExprMetaModel.getConstructorParameters().add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel); + jmlMultiCompareExprMetaModel.getConstructorParameters().add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel); + jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.kindPropertyMetaModel); + jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.labelPropertyMetaModel); + jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.expressionPropertyMetaModel); + jmlSetComprehensionExprMetaModel.getConstructorParameters().add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel); + jmlSetComprehensionExprMetaModel.getConstructorParameters().add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel); assertStmtMetaModel.getConstructorParameters().add(assertStmtMetaModel.checkPropertyMetaModel); assertStmtMetaModel.getConstructorParameters().add(assertStmtMetaModel.messagePropertyMetaModel); blockStmtMetaModel.getConstructorParameters().add(blockStmtMetaModel.statementsPropertyMetaModel); + blockStmtMetaModel.getConstructorParameters().add(blockStmtMetaModel.contractsPropertyMetaModel); breakStmtMetaModel.getConstructorParameters().add(breakStmtMetaModel.labelPropertyMetaModel); catchClauseMetaModel.getConstructorParameters().add(catchClauseMetaModel.parameterPropertyMetaModel); catchClauseMetaModel.getConstructorParameters().add(catchClauseMetaModel.bodyPropertyMetaModel); continueStmtMetaModel.getConstructorParameters().add(continueStmtMetaModel.labelPropertyMetaModel); doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.bodyPropertyMetaModel); doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.conditionPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel - .getConstructorParameters() - .add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel - .getConstructorParameters() - .add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel - .getConstructorParameters() - .add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel - .getConstructorParameters() - .add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel); + doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.contractsPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel); expressionStmtMetaModel.getConstructorParameters().add(expressionStmtMetaModel.expressionPropertyMetaModel); forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.variablePropertyMetaModel); forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.iterablePropertyMetaModel); forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.bodyPropertyMetaModel); + forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.contractsPropertyMetaModel); forStmtMetaModel.getConstructorParameters().add(forStmtMetaModel.initializationPropertyMetaModel); forStmtMetaModel.getConstructorParameters().add(forStmtMetaModel.comparePropertyMetaModel); forStmtMetaModel.getConstructorParameters().add(forStmtMetaModel.updatePropertyMetaModel); forStmtMetaModel.getConstructorParameters().add(forStmtMetaModel.bodyPropertyMetaModel); + forStmtMetaModel.getConstructorParameters().add(forStmtMetaModel.contractsPropertyMetaModel); ifStmtMetaModel.getConstructorParameters().add(ifStmtMetaModel.conditionPropertyMetaModel); ifStmtMetaModel.getConstructorParameters().add(ifStmtMetaModel.thenStmtPropertyMetaModel); ifStmtMetaModel.getConstructorParameters().add(ifStmtMetaModel.elseStmtPropertyMetaModel); labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.labelPropertyMetaModel); labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.statementPropertyMetaModel); - localClassDeclarationStmtMetaModel - .getConstructorParameters() - .add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel); - localRecordDeclarationStmtMetaModel - .getConstructorParameters() - .add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel); + localClassDeclarationStmtMetaModel.getConstructorParameters().add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel); + localRecordDeclarationStmtMetaModel.getConstructorParameters().add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel); returnStmtMetaModel.getConstructorParameters().add(returnStmtMetaModel.expressionPropertyMetaModel); switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.labelsPropertyMetaModel); switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.typePropertyMetaModel); @@ -453,19 +300,78 @@ private static void initializeConstructorParameters() { tryStmtMetaModel.getConstructorParameters().add(tryStmtMetaModel.finallyBlockPropertyMetaModel); whileStmtMetaModel.getConstructorParameters().add(whileStmtMetaModel.conditionPropertyMetaModel); whileStmtMetaModel.getConstructorParameters().add(whileStmtMetaModel.bodyPropertyMetaModel); + whileStmtMetaModel.getConstructorParameters().add(whileStmtMetaModel.contractsPropertyMetaModel); yieldStmtMetaModel.getConstructorParameters().add(yieldStmtMetaModel.expressionPropertyMetaModel); + jmlGhostStmtMetaModel.getConstructorParameters().add(jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel); + jmlGhostStmtMetaModel.getConstructorParameters().add(jmlGhostStmtMetaModel.statementPropertyMetaModel); + jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel); + jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.kindPropertyMetaModel); + jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel); + jmlRefiningStmtMetaModel.getConstructorParameters().add(jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel); + jmlUnreachableStmtMetaModel.getConstructorParameters().add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel); + jmlLabelStmtMetaModel.getConstructorParameters().add(jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel); + jmlLabelStmtMetaModel.getConstructorParameters().add(jmlLabelStmtMetaModel.labelPropertyMetaModel); + jmlBeginStmtMetaModel.getConstructorParameters().add(jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel); + jmlEndStmtMetaModel.getConstructorParameters().add(jmlEndStmtMetaModel.jmlTagsPropertyMetaModel); + jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel); + jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel); + jmlFieldDeclarationMetaModel.getConstructorParameters().add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlFieldDeclarationMetaModel.getConstructorParameters().add(jmlFieldDeclarationMetaModel.declPropertyMetaModel); + jmlClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.kindPropertyMetaModel); + jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel); + jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel); + jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.kindPropertyMetaModel); + jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.heapsPropertyMetaModel); + jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel); + jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlSignalsClauseMetaModel.parameterPropertyMetaModel); + jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlSignalsClauseMetaModel.expressionPropertyMetaModel); + jmlSignalsOnlyClauseMetaModel.getConstructorParameters().add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel); + jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.kindPropertyMetaModel); + jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.labelPropertyMetaModel); + jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.exprPropertyMetaModel); + jmlForallClauseMetaModel.getConstructorParameters().add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel); + jmlOldClauseMetaModel.getConstructorParameters().add(jmlOldClauseMetaModel.declarationsPropertyMetaModel); + jmlCallableClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlCallableClauseMetaModel.getConstructorParameters().add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel); + jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.conditionPropertyMetaModel); + jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.kindPropertyMetaModel); + jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.thenPropertyMetaModel); + jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel); + jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.namePropertyMetaModel); + jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.jmlTagsPropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.typePropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.behaviorPropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.namePropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.modifiersPropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.clausesPropertyMetaModel); + jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.subContractsPropertyMetaModel); + jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel); + jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel); + jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel); + jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel); + jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel); arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.componentTypePropertyMetaModel); arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.originPropertyMetaModel); arrayTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel); - classOrInterfaceTypeMetaModel - .getConstructorParameters() - .add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel); - classOrInterfaceTypeMetaModel - .getConstructorParameters() - .add(classOrInterfaceTypeMetaModel.namePropertyMetaModel); - classOrInterfaceTypeMetaModel - .getConstructorParameters() - .add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel); + classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel); + classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.namePropertyMetaModel); + classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel); classOrInterfaceTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel); intersectionTypeMetaModel.getConstructorParameters().add(intersectionTypeMetaModel.elementsPropertyMetaModel); primitiveTypeMetaModel.getConstructorParameters().add(primitiveTypeMetaModel.typePropertyMetaModel); @@ -477,30 +383,14 @@ private static void initializeConstructorParameters() { wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel); wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.superTypePropertyMetaModel); wildcardTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel); - moduleExportsDirectiveMetaModel - .getConstructorParameters() - .add(moduleExportsDirectiveMetaModel.namePropertyMetaModel); - moduleExportsDirectiveMetaModel - .getConstructorParameters() - .add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel); - moduleOpensDirectiveMetaModel - .getConstructorParameters() - .add(moduleOpensDirectiveMetaModel.namePropertyMetaModel); - moduleOpensDirectiveMetaModel - .getConstructorParameters() - .add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel); - moduleProvidesDirectiveMetaModel - .getConstructorParameters() - .add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel); - moduleProvidesDirectiveMetaModel - .getConstructorParameters() - .add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel); - moduleRequiresDirectiveMetaModel - .getConstructorParameters() - .add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel); - moduleRequiresDirectiveMetaModel - .getConstructorParameters() - .add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel); + moduleExportsDirectiveMetaModel.getConstructorParameters().add(moduleExportsDirectiveMetaModel.namePropertyMetaModel); + moduleExportsDirectiveMetaModel.getConstructorParameters().add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel); + moduleOpensDirectiveMetaModel.getConstructorParameters().add(moduleOpensDirectiveMetaModel.namePropertyMetaModel); + moduleOpensDirectiveMetaModel.getConstructorParameters().add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel); + moduleProvidesDirectiveMetaModel.getConstructorParameters().add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel); + moduleProvidesDirectiveMetaModel.getConstructorParameters().add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel); + moduleRequiresDirectiveMetaModel.getConstructorParameters().add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel); + moduleRequiresDirectiveMetaModel.getConstructorParameters().add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel); moduleUsesDirectiveMetaModel.getConstructorParameters().add(moduleUsesDirectiveMetaModel.namePropertyMetaModel); } @@ -559,6 +449,43 @@ private static void initializeNodeMetaModels() { nodeMetaModels.add(integerLiteralExprMetaModel); nodeMetaModels.add(intersectionTypeMetaModel); nodeMetaModels.add(javadocCommentMetaModel); + nodeMetaModels.add(jmlBeginStmtMetaModel); + nodeMetaModels.add(jmlBinaryInfixExprMetaModel); + nodeMetaModels.add(jmlCallableClauseMetaModel); + nodeMetaModels.add(jmlClassAccessibleDeclarationMetaModel); + nodeMetaModels.add(jmlClassExprDeclarationMetaModel); + nodeMetaModels.add(jmlClassLevelDeclarationMetaModel); + nodeMetaModels.add(jmlClauseIfMetaModel); + nodeMetaModels.add(jmlClauseLabelMetaModel); + nodeMetaModels.add(jmlClauseMetaModel); + nodeMetaModels.add(jmlContractMetaModel); + nodeMetaModels.add(jmlDocDeclarationMetaModel); + nodeMetaModels.add(jmlDocMetaModel); + nodeMetaModels.add(jmlDocStmtMetaModel); + nodeMetaModels.add(jmlDocTypeMetaModel); + nodeMetaModels.add(jmlEndStmtMetaModel); + nodeMetaModels.add(jmlExpressionStmtMetaModel); + nodeMetaModels.add(jmlFieldDeclarationMetaModel); + nodeMetaModels.add(jmlForallClauseMetaModel); + nodeMetaModels.add(jmlGhostStmtMetaModel); + nodeMetaModels.add(jmlLabelExprMetaModel); + nodeMetaModels.add(jmlLabelStmtMetaModel); + nodeMetaModels.add(jmlLetExprMetaModel); + nodeMetaModels.add(jmlMethodDeclarationMetaModel); + nodeMetaModels.add(jmlMethodSignatureMetaModel); + nodeMetaModels.add(jmlMultiCompareExprMetaModel); + nodeMetaModels.add(jmlMultiExprClauseMetaModel); + nodeMetaModels.add(jmlOldClauseMetaModel); + nodeMetaModels.add(jmlQuantifiedExprMetaModel); + nodeMetaModels.add(jmlRefiningStmtMetaModel); + nodeMetaModels.add(jmlRepresentsDeclarationMetaModel); + nodeMetaModels.add(jmlSetComprehensionExprMetaModel); + nodeMetaModels.add(jmlSignalsClauseMetaModel); + nodeMetaModels.add(jmlSignalsOnlyClauseMetaModel); + nodeMetaModels.add(jmlSimpleExprClauseMetaModel); + nodeMetaModels.add(jmlStatementMetaModel); + nodeMetaModels.add(jmlTypeExprMetaModel); + nodeMetaModels.add(jmlUnreachableStmtMetaModel); nodeMetaModels.add(labeledStmtMetaModel); nodeMetaModels.add(lambdaExprMetaModel); nodeMetaModels.add(lineCommentMetaModel); @@ -628,2329 +555,620 @@ private static void initializeNodeMetaModels() { @Generated("com.github.javaparser.generator.metamodel.MetaModelGenerator") private static void initializePropertyMetaModels() { - nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel( - nodeMetaModel, - "comment", - com.github.javaparser.ast.comments.Comment.class, - Optional.of(commentMetaModel), - true, - false, - false, - false); + nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel(nodeMetaModel, "comment", com.github.javaparser.ast.comments.Comment.class, Optional.of(commentMetaModel), true, false, false, false); nodeMetaModel.getDeclaredPropertyMetaModels().add(nodeMetaModel.commentPropertyMetaModel); - bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - bodyDeclarationMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - bodyDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); - callableDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.modifiersPropertyMetaModel); - callableDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.namePropertyMetaModel); - callableDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "parameters", - com.github.javaparser.ast.body.Parameter.class, - Optional.of(parameterMetaModel), - false, - false, - true, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.parametersPropertyMetaModel); - callableDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "receiverParameter", - com.github.javaparser.ast.body.ReceiverParameter.class, - Optional.of(receiverParameterMetaModel), - true, - false, - false, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); - callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "thrownExceptions", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - false, - false, - true, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); - callableDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel( - callableDeclarationMetaModel, - "typeParameters", - com.github.javaparser.ast.type.TypeParameter.class, - Optional.of(typeParameterMetaModel), - false, - false, - true, - false); - callableDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); - typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - typeMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); + bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(bodyDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + bodyDeclarationMetaModel.getDeclaredPropertyMetaModels().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel); + callableDeclarationMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.contractsPropertyMetaModel); + callableDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.modifiersPropertyMetaModel); + callableDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.namePropertyMetaModel); + callableDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.parametersPropertyMetaModel); + callableDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "receiverParameter", com.github.javaparser.ast.body.ReceiverParameter.class, Optional.of(receiverParameterMetaModel), true, false, false, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel); + callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "thrownExceptions", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, true, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + callableDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false); + callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel); + typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(typeMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); typeMetaModel.getDeclaredPropertyMetaModels().add(typeMetaModel.annotationsPropertyMetaModel); - annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - annotationExprMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); + annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationExprMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); annotationExprMetaModel.getDeclaredPropertyMetaModels().add(annotationExprMetaModel.namePropertyMetaModel); - typeDeclarationMetaModel.membersPropertyMetaModel = new PropertyMetaModel( - typeDeclarationMetaModel, - "members", - com.github.javaparser.ast.body.BodyDeclaration.class, - Optional.of(bodyDeclarationMetaModel), - false, - false, - true, - true); + typeDeclarationMetaModel.membersPropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "members", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), false, false, true, true); typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.membersPropertyMetaModel); - typeDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - typeDeclarationMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - typeDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(typeDeclarationMetaModel.modifiersPropertyMetaModel); - typeDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - typeDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + typeDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.modifiersPropertyMetaModel); + typeDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.namePropertyMetaModel); - literalStringValueExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel( - literalStringValueExprMetaModel, - "value", - java.lang.String.class, - Optional.empty(), - false, - false, - false, - false); - literalStringValueExprMetaModel - .getDeclaredPropertyMetaModels() - .add(literalStringValueExprMetaModel.valuePropertyMetaModel); - moduleDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - moduleDeclarationMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - moduleDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleDeclarationMetaModel.annotationsPropertyMetaModel); - moduleDeclarationMetaModel.directivesPropertyMetaModel = new PropertyMetaModel( - moduleDeclarationMetaModel, - "directives", - com.github.javaparser.ast.modules.ModuleDirective.class, - Optional.of(moduleDirectiveMetaModel), - false, - false, - true, - false); - moduleDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleDeclarationMetaModel.directivesPropertyMetaModel); - moduleDeclarationMetaModel.isOpenPropertyMetaModel = new PropertyMetaModel( - moduleDeclarationMetaModel, "isOpen", boolean.class, Optional.empty(), false, false, false, false); - moduleDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleDeclarationMetaModel.isOpenPropertyMetaModel); - moduleDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleDeclarationMetaModel.namePropertyMetaModel); - arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - arrayCreationLevelMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - arrayCreationLevelMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel); - arrayCreationLevelMetaModel.dimensionPropertyMetaModel = new PropertyMetaModel( - arrayCreationLevelMetaModel, - "dimension", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); - arrayCreationLevelMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel); - compilationUnitMetaModel.importsPropertyMetaModel = new PropertyMetaModel( - compilationUnitMetaModel, - "imports", - com.github.javaparser.ast.ImportDeclaration.class, - Optional.of(importDeclarationMetaModel), - false, - false, - true, - false); + literalStringValueExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(literalStringValueExprMetaModel, "value", java.lang.String.class, Optional.empty(), false, false, false, false); + literalStringValueExprMetaModel.getDeclaredPropertyMetaModels().add(literalStringValueExprMetaModel.valuePropertyMetaModel); + moduleDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.annotationsPropertyMetaModel); + moduleDeclarationMetaModel.directivesPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "directives", com.github.javaparser.ast.modules.ModuleDirective.class, Optional.of(moduleDirectiveMetaModel), false, false, true, false); + moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.directivesPropertyMetaModel); + moduleDeclarationMetaModel.isOpenPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "isOpen", boolean.class, Optional.empty(), false, false, false, false); + moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.isOpenPropertyMetaModel); + moduleDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.namePropertyMetaModel); + arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + arrayCreationLevelMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel); + arrayCreationLevelMetaModel.dimensionPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "dimension", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); + arrayCreationLevelMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel); + compilationUnitMetaModel.importsPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "imports", com.github.javaparser.ast.ImportDeclaration.class, Optional.of(importDeclarationMetaModel), false, false, true, false); compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.importsPropertyMetaModel); - compilationUnitMetaModel.modulePropertyMetaModel = new PropertyMetaModel( - compilationUnitMetaModel, - "module", - com.github.javaparser.ast.modules.ModuleDeclaration.class, - Optional.of(moduleDeclarationMetaModel), - true, - false, - false, - false); + compilationUnitMetaModel.modulePropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "module", com.github.javaparser.ast.modules.ModuleDeclaration.class, Optional.of(moduleDeclarationMetaModel), true, false, false, false); compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.modulePropertyMetaModel); - compilationUnitMetaModel.packageDeclarationPropertyMetaModel = new PropertyMetaModel( - compilationUnitMetaModel, - "packageDeclaration", - com.github.javaparser.ast.PackageDeclaration.class, - Optional.of(packageDeclarationMetaModel), - true, - false, - false, - false); - compilationUnitMetaModel - .getDeclaredPropertyMetaModels() - .add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel); - compilationUnitMetaModel.typesPropertyMetaModel = new PropertyMetaModel( - compilationUnitMetaModel, - "types", - com.github.javaparser.ast.body.TypeDeclaration.class, - Optional.of(typeDeclarationMetaModel), - false, - false, - true, - true); + compilationUnitMetaModel.packageDeclarationPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "packageDeclaration", com.github.javaparser.ast.PackageDeclaration.class, Optional.of(packageDeclarationMetaModel), true, false, false, false); + compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel); + compilationUnitMetaModel.typesPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "types", com.github.javaparser.ast.body.TypeDeclaration.class, Optional.of(typeDeclarationMetaModel), false, false, true, true); compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.typesPropertyMetaModel); - importDeclarationMetaModel.isAsteriskPropertyMetaModel = new PropertyMetaModel( - importDeclarationMetaModel, "isAsterisk", boolean.class, Optional.empty(), false, false, false, false); - importDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(importDeclarationMetaModel.isAsteriskPropertyMetaModel); - importDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel( - importDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false); - importDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(importDeclarationMetaModel.isStaticPropertyMetaModel); - importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - importDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - importDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(importDeclarationMetaModel.namePropertyMetaModel); - modifierMetaModel.keywordPropertyMetaModel = new PropertyMetaModel( - modifierMetaModel, - "keyword", - com.github.javaparser.ast.Modifier.Keyword.class, - Optional.empty(), - false, - false, - false, - false); + importDeclarationMetaModel.isAsteriskPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isAsterisk", boolean.class, Optional.empty(), false, false, false, false); + importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isAsteriskPropertyMetaModel); + importDeclarationMetaModel.isJmlModelPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isJmlModel", boolean.class, Optional.empty(), false, false, false, false); + importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isJmlModelPropertyMetaModel); + importDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false); + importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isStaticPropertyMetaModel); + importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.namePropertyMetaModel); + modifierMetaModel.keywordPropertyMetaModel = new PropertyMetaModel(modifierMetaModel, "keyword", com.github.javaparser.ast.Modifier.Keyword.class, Optional.empty(), false, false, false, false); modifierMetaModel.getDeclaredPropertyMetaModels().add(modifierMetaModel.keywordPropertyMetaModel); - packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - packageDeclarationMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - packageDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(packageDeclarationMetaModel.annotationsPropertyMetaModel); - packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - packageDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - packageDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(packageDeclarationMetaModel.namePropertyMetaModel); - annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel = new PropertyMetaModel( - annotationMemberDeclarationMetaModel, - "defaultValue", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); - annotationMemberDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel); - annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - annotationMemberDeclarationMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - annotationMemberDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel); - annotationMemberDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - annotationMemberDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - annotationMemberDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(annotationMemberDeclarationMetaModel.namePropertyMetaModel); - annotationMemberDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel( - annotationMemberDeclarationMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); - annotationMemberDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(annotationMemberDeclarationMetaModel.typePropertyMetaModel); - classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceDeclarationMetaModel, - "extendedTypes", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); - classOrInterfaceDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceDeclarationMetaModel, - "implementedTypes", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); - classOrInterfaceDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel = new PropertyMetaModel( - classOrInterfaceDeclarationMetaModel, - "isInterface", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - classOrInterfaceDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel); - classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceDeclarationMetaModel, - "permittedTypes", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); - classOrInterfaceDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel); - classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceDeclarationMetaModel, - "typeParameters", - com.github.javaparser.ast.type.TypeParameter.class, - Optional.of(typeParameterMetaModel), - false, - false, - true, - false); - classOrInterfaceDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel); - constructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - constructorDeclarationMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); - constructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(constructorDeclarationMetaModel.bodyPropertyMetaModel); - enumConstantDeclarationMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel( - enumConstantDeclarationMetaModel, - "arguments", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); - enumConstantDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel); - enumConstantDeclarationMetaModel.classBodyPropertyMetaModel = new PropertyMetaModel( - enumConstantDeclarationMetaModel, - "classBody", - com.github.javaparser.ast.body.BodyDeclaration.class, - Optional.of(bodyDeclarationMetaModel), - false, - false, - true, - true); - enumConstantDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel); - enumConstantDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - enumConstantDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - enumConstantDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(enumConstantDeclarationMetaModel.namePropertyMetaModel); - enumDeclarationMetaModel.entriesPropertyMetaModel = new PropertyMetaModel( - enumDeclarationMetaModel, - "entries", - com.github.javaparser.ast.body.EnumConstantDeclaration.class, - Optional.of(enumConstantDeclarationMetaModel), - false, - false, - true, - false); + packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + packageDeclarationMetaModel.getDeclaredPropertyMetaModels().add(packageDeclarationMetaModel.annotationsPropertyMetaModel); + packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + packageDeclarationMetaModel.getDeclaredPropertyMetaModels().add(packageDeclarationMetaModel.namePropertyMetaModel); + annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "defaultValue", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); + annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel); + annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel); + annotationMemberDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.namePropertyMetaModel); + annotationMemberDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.typePropertyMetaModel); + classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "extendedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); + classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); + classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "isInterface", boolean.class, Optional.empty(), false, false, false, false); + classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel); + classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "permittedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); + classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel); + classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false); + classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel); + constructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(constructorDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); + constructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(constructorDeclarationMetaModel.bodyPropertyMetaModel); + enumConstantDeclarationMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel); + enumConstantDeclarationMetaModel.classBodyPropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "classBody", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), false, false, true, true); + enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel); + enumConstantDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.namePropertyMetaModel); + enumDeclarationMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(enumDeclarationMetaModel, "entries", com.github.javaparser.ast.body.EnumConstantDeclaration.class, Optional.of(enumConstantDeclarationMetaModel), false, false, true, false); enumDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumDeclarationMetaModel.entriesPropertyMetaModel); - enumDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel( - enumDeclarationMetaModel, - "implementedTypes", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); - enumDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel); - fieldDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - fieldDeclarationMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - fieldDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(fieldDeclarationMetaModel.modifiersPropertyMetaModel); - fieldDeclarationMetaModel.variablesPropertyMetaModel = new PropertyMetaModel( - fieldDeclarationMetaModel, - "variables", - com.github.javaparser.ast.body.VariableDeclarator.class, - Optional.of(variableDeclaratorMetaModel), - false, - true, - true, - false); - fieldDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(fieldDeclarationMetaModel.variablesPropertyMetaModel); - fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel( - fieldDeclarationMetaModel, - "maximumCommonType", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - false, - false); - fieldDeclarationMetaModel - .getDerivedPropertyMetaModels() - .add(fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel); - initializerDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - initializerDeclarationMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); - initializerDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(initializerDeclarationMetaModel.bodyPropertyMetaModel); - initializerDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel( - initializerDeclarationMetaModel, - "isStatic", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - initializerDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(initializerDeclarationMetaModel.isStaticPropertyMetaModel); - methodDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - methodDeclarationMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - true, - false, - false, - false); - methodDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(methodDeclarationMetaModel.bodyPropertyMetaModel); - methodDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel( - methodDeclarationMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); - methodDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(methodDeclarationMetaModel.typePropertyMetaModel); - parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); + enumDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(enumDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); + enumDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel); + fieldDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + fieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(fieldDeclarationMetaModel.modifiersPropertyMetaModel); + fieldDeclarationMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "variables", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, true, true, false); + fieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(fieldDeclarationMetaModel.variablesPropertyMetaModel); + fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "maximumCommonType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false); + fieldDeclarationMetaModel.getDerivedPropertyMetaModels().add(fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel); + initializerDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(initializerDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); + initializerDeclarationMetaModel.getDeclaredPropertyMetaModels().add(initializerDeclarationMetaModel.bodyPropertyMetaModel); + initializerDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(initializerDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false); + initializerDeclarationMetaModel.getDeclaredPropertyMetaModels().add(initializerDeclarationMetaModel.isStaticPropertyMetaModel); + methodDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(methodDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false); + methodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(methodDeclarationMetaModel.bodyPropertyMetaModel); + methodDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(methodDeclarationMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + methodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(methodDeclarationMetaModel.typePropertyMetaModel); + parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.annotationsPropertyMetaModel); - parameterMetaModel.isVarArgsPropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, "isVarArgs", boolean.class, Optional.empty(), false, false, false, false); + parameterMetaModel.isVarArgsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "isVarArgs", boolean.class, Optional.empty(), false, false, false, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.isVarArgsPropertyMetaModel); - parameterMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); + parameterMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.modifiersPropertyMetaModel); - parameterMetaModel.namePropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + parameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.namePropertyMetaModel); - parameterMetaModel.typePropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); + parameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.typePropertyMetaModel); - parameterMetaModel.varArgsAnnotationsPropertyMetaModel = new PropertyMetaModel( - parameterMetaModel, - "varArgsAnnotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); + parameterMetaModel.varArgsAnnotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "varArgsAnnotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.varArgsAnnotationsPropertyMetaModel); - receiverParameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - receiverParameterMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - receiverParameterMetaModel - .getDeclaredPropertyMetaModels() - .add(receiverParameterMetaModel.annotationsPropertyMetaModel); - receiverParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel( - receiverParameterMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - receiverParameterMetaModel - .getDeclaredPropertyMetaModels() - .add(receiverParameterMetaModel.namePropertyMetaModel); - receiverParameterMetaModel.typePropertyMetaModel = new PropertyMetaModel( - receiverParameterMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); - receiverParameterMetaModel - .getDeclaredPropertyMetaModels() - .add(receiverParameterMetaModel.typePropertyMetaModel); - recordDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel( - recordDeclarationMetaModel, - "implementedTypes", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); - recordDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel); - recordDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel( - recordDeclarationMetaModel, - "parameters", - com.github.javaparser.ast.body.Parameter.class, - Optional.of(parameterMetaModel), - false, - false, - true, - false); - recordDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(recordDeclarationMetaModel.parametersPropertyMetaModel); - recordDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel( - recordDeclarationMetaModel, - "receiverParameter", - com.github.javaparser.ast.body.ReceiverParameter.class, - Optional.of(receiverParameterMetaModel), - true, - false, - false, - false); - recordDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel); - recordDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel( - recordDeclarationMetaModel, - "typeParameters", - com.github.javaparser.ast.type.TypeParameter.class, - Optional.of(typeParameterMetaModel), - false, - false, - true, - false); - recordDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(recordDeclarationMetaModel.typeParametersPropertyMetaModel); - compactConstructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - compactConstructorDeclarationMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); - compactConstructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel); - compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - compactConstructorDeclarationMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - compactConstructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel); - compactConstructorDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel( - compactConstructorDeclarationMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - compactConstructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(compactConstructorDeclarationMetaModel.namePropertyMetaModel); - compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel( - compactConstructorDeclarationMetaModel, - "thrownExceptions", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - false, - false, - true, - false); - compactConstructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel); - compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel( - compactConstructorDeclarationMetaModel, - "typeParameters", - com.github.javaparser.ast.type.TypeParameter.class, - Optional.of(typeParameterMetaModel), - false, - false, - true, - false); - compactConstructorDeclarationMetaModel - .getDeclaredPropertyMetaModels() - .add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel); - variableDeclaratorMetaModel.initializerPropertyMetaModel = new PropertyMetaModel( - variableDeclaratorMetaModel, - "initializer", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - true, - false, - false); - variableDeclaratorMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclaratorMetaModel.initializerPropertyMetaModel); - variableDeclaratorMetaModel.namePropertyMetaModel = new PropertyMetaModel( - variableDeclaratorMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - variableDeclaratorMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclaratorMetaModel.namePropertyMetaModel); - variableDeclaratorMetaModel.typePropertyMetaModel = new PropertyMetaModel( - variableDeclaratorMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); - variableDeclaratorMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclaratorMetaModel.typePropertyMetaModel); - commentMetaModel.contentPropertyMetaModel = new PropertyMetaModel( - commentMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false); + receiverParameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.annotationsPropertyMetaModel); + receiverParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.namePropertyMetaModel); + receiverParameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.typePropertyMetaModel); + recordDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); + recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel); + recordDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false); + recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.parametersPropertyMetaModel); + recordDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "receiverParameter", com.github.javaparser.ast.body.ReceiverParameter.class, Optional.of(receiverParameterMetaModel), true, false, false, false); + recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel); + recordDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false); + recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.typeParametersPropertyMetaModel); + compactConstructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); + compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel); + compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel); + compactConstructorDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.namePropertyMetaModel); + compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "thrownExceptions", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, true, false); + compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel); + compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false); + compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel); + variableDeclaratorMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "initializer", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, true, false, false); + variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.initializerPropertyMetaModel); + variableDeclaratorMetaModel.namePropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.namePropertyMetaModel); + variableDeclaratorMetaModel.typePropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.typePropertyMetaModel); + commentMetaModel.contentPropertyMetaModel = new PropertyMetaModel(commentMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false); commentMetaModel.getDeclaredPropertyMetaModels().add(commentMetaModel.contentPropertyMetaModel); - arrayAccessExprMetaModel.indexPropertyMetaModel = new PropertyMetaModel( - arrayAccessExprMetaModel, - "index", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + arrayAccessExprMetaModel.indexPropertyMetaModel = new PropertyMetaModel(arrayAccessExprMetaModel, "index", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); arrayAccessExprMetaModel.getDeclaredPropertyMetaModels().add(arrayAccessExprMetaModel.indexPropertyMetaModel); - arrayAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - arrayAccessExprMetaModel, - "name", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + arrayAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(arrayAccessExprMetaModel, "name", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); arrayAccessExprMetaModel.getDeclaredPropertyMetaModels().add(arrayAccessExprMetaModel.namePropertyMetaModel); - arrayCreationExprMetaModel.elementTypePropertyMetaModel = new PropertyMetaModel( - arrayCreationExprMetaModel, - "elementType", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); - arrayCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayCreationExprMetaModel.elementTypePropertyMetaModel); - arrayCreationExprMetaModel.initializerPropertyMetaModel = new PropertyMetaModel( - arrayCreationExprMetaModel, - "initializer", - com.github.javaparser.ast.expr.ArrayInitializerExpr.class, - Optional.of(arrayInitializerExprMetaModel), - true, - false, - false, - false); - arrayCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayCreationExprMetaModel.initializerPropertyMetaModel); - arrayCreationExprMetaModel.levelsPropertyMetaModel = new PropertyMetaModel( - arrayCreationExprMetaModel, - "levels", - com.github.javaparser.ast.ArrayCreationLevel.class, - Optional.of(arrayCreationLevelMetaModel), - false, - true, - true, - false); - arrayCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayCreationExprMetaModel.levelsPropertyMetaModel); - arrayInitializerExprMetaModel.valuesPropertyMetaModel = new PropertyMetaModel( - arrayInitializerExprMetaModel, - "values", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); - arrayInitializerExprMetaModel - .getDeclaredPropertyMetaModels() - .add(arrayInitializerExprMetaModel.valuesPropertyMetaModel); - assignExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel( - assignExprMetaModel, - "operator", - com.github.javaparser.ast.expr.AssignExpr.Operator.class, - Optional.empty(), - false, - false, - false, - false); + arrayCreationExprMetaModel.elementTypePropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "elementType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.elementTypePropertyMetaModel); + arrayCreationExprMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "initializer", com.github.javaparser.ast.expr.ArrayInitializerExpr.class, Optional.of(arrayInitializerExprMetaModel), true, false, false, false); + arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.initializerPropertyMetaModel); + arrayCreationExprMetaModel.levelsPropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "levels", com.github.javaparser.ast.ArrayCreationLevel.class, Optional.of(arrayCreationLevelMetaModel), false, true, true, false); + arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.levelsPropertyMetaModel); + arrayInitializerExprMetaModel.valuesPropertyMetaModel = new PropertyMetaModel(arrayInitializerExprMetaModel, "values", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + arrayInitializerExprMetaModel.getDeclaredPropertyMetaModels().add(arrayInitializerExprMetaModel.valuesPropertyMetaModel); + assignExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "operator", com.github.javaparser.ast.expr.AssignExpr.Operator.class, Optional.empty(), false, false, false, false); assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.operatorPropertyMetaModel); - assignExprMetaModel.targetPropertyMetaModel = new PropertyMetaModel( - assignExprMetaModel, - "target", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + assignExprMetaModel.targetPropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "target", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.targetPropertyMetaModel); - assignExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel( - assignExprMetaModel, - "value", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + assignExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "value", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.valuePropertyMetaModel); - binaryExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel( - binaryExprMetaModel, - "left", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + binaryExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "left", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.leftPropertyMetaModel); - binaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel( - binaryExprMetaModel, - "operator", - com.github.javaparser.ast.expr.BinaryExpr.Operator.class, - Optional.empty(), - false, - false, - false, - false); + binaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "operator", com.github.javaparser.ast.expr.BinaryExpr.Operator.class, Optional.empty(), false, false, false, false); binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.operatorPropertyMetaModel); - binaryExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel( - binaryExprMetaModel, - "right", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + binaryExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "right", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.rightPropertyMetaModel); - booleanLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel( - booleanLiteralExprMetaModel, "value", boolean.class, Optional.empty(), false, false, false, false); - booleanLiteralExprMetaModel - .getDeclaredPropertyMetaModels() - .add(booleanLiteralExprMetaModel.valuePropertyMetaModel); - castExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - castExprMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + booleanLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(booleanLiteralExprMetaModel, "value", boolean.class, Optional.empty(), false, false, false, false); + booleanLiteralExprMetaModel.getDeclaredPropertyMetaModels().add(booleanLiteralExprMetaModel.valuePropertyMetaModel); + castExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(castExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); castExprMetaModel.getDeclaredPropertyMetaModels().add(castExprMetaModel.expressionPropertyMetaModel); - castExprMetaModel.typePropertyMetaModel = new PropertyMetaModel( - castExprMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); + castExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(castExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); castExprMetaModel.getDeclaredPropertyMetaModels().add(castExprMetaModel.typePropertyMetaModel); - classExprMetaModel.typePropertyMetaModel = new PropertyMetaModel( - classExprMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); + classExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(classExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); classExprMetaModel.getDeclaredPropertyMetaModels().add(classExprMetaModel.typePropertyMetaModel); - conditionalExprMetaModel.conditionPropertyMetaModel = new PropertyMetaModel( - conditionalExprMetaModel, - "condition", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - conditionalExprMetaModel - .getDeclaredPropertyMetaModels() - .add(conditionalExprMetaModel.conditionPropertyMetaModel); - conditionalExprMetaModel.elseExprPropertyMetaModel = new PropertyMetaModel( - conditionalExprMetaModel, - "elseExpr", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - conditionalExprMetaModel - .getDeclaredPropertyMetaModels() - .add(conditionalExprMetaModel.elseExprPropertyMetaModel); - conditionalExprMetaModel.thenExprPropertyMetaModel = new PropertyMetaModel( - conditionalExprMetaModel, - "thenExpr", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - conditionalExprMetaModel - .getDeclaredPropertyMetaModels() - .add(conditionalExprMetaModel.thenExprPropertyMetaModel); - enclosedExprMetaModel.innerPropertyMetaModel = new PropertyMetaModel( - enclosedExprMetaModel, - "inner", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + conditionalExprMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.conditionPropertyMetaModel); + conditionalExprMetaModel.elseExprPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "elseExpr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.elseExprPropertyMetaModel); + conditionalExprMetaModel.thenExprPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "thenExpr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.thenExprPropertyMetaModel); + enclosedExprMetaModel.innerPropertyMetaModel = new PropertyMetaModel(enclosedExprMetaModel, "inner", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); enclosedExprMetaModel.getDeclaredPropertyMetaModels().add(enclosedExprMetaModel.innerPropertyMetaModel); - fieldAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - fieldAccessExprMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + fieldAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.namePropertyMetaModel); - fieldAccessExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel( - fieldAccessExprMetaModel, - "scope", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + fieldAccessExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.scopePropertyMetaModel); - fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - fieldAccessExprMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - fieldAccessExprMetaModel - .getDeclaredPropertyMetaModels() - .add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel); - fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - fieldAccessExprMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - fieldAccessExprMetaModel - .getDerivedPropertyMetaModels() - .add(fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel); - instanceOfExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - instanceOfExprMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - instanceOfExprMetaModel - .getDeclaredPropertyMetaModels() - .add(instanceOfExprMetaModel.expressionPropertyMetaModel); - instanceOfExprMetaModel.patternPropertyMetaModel = new PropertyMetaModel( - instanceOfExprMetaModel, - "pattern", - com.github.javaparser.ast.expr.PatternExpr.class, - Optional.of(patternExprMetaModel), - true, - false, - false, - false); + fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel); + fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + fieldAccessExprMetaModel.getDerivedPropertyMetaModels().add(fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel); + instanceOfExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.expressionPropertyMetaModel); + instanceOfExprMetaModel.patternPropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "pattern", com.github.javaparser.ast.expr.PatternExpr.class, Optional.of(patternExprMetaModel), true, false, false, false); instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.patternPropertyMetaModel); - instanceOfExprMetaModel.typePropertyMetaModel = new PropertyMetaModel( - instanceOfExprMetaModel, - "type", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - false, - false, - false, - false); + instanceOfExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "type", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, false, false); instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.typePropertyMetaModel); - lambdaExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - lambdaExprMetaModel, - "body", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + lambdaExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.bodyPropertyMetaModel); - lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel = new PropertyMetaModel( - lambdaExprMetaModel, - "isEnclosingParameters", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - lambdaExprMetaModel - .getDeclaredPropertyMetaModels() - .add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel); - lambdaExprMetaModel.parametersPropertyMetaModel = new PropertyMetaModel( - lambdaExprMetaModel, - "parameters", - com.github.javaparser.ast.body.Parameter.class, - Optional.of(parameterMetaModel), - false, - false, - true, - false); + lambdaExprMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.contractsPropertyMetaModel); + lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "isEnclosingParameters", boolean.class, Optional.empty(), false, false, false, false); + lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel); + lambdaExprMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false); lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.parametersPropertyMetaModel); - lambdaExprMetaModel.expressionBodyPropertyMetaModel = new PropertyMetaModel( - lambdaExprMetaModel, - "expressionBody", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + lambdaExprMetaModel.expressionBodyPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "expressionBody", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); lambdaExprMetaModel.getDerivedPropertyMetaModels().add(lambdaExprMetaModel.expressionBodyPropertyMetaModel); - memberValuePairMetaModel.namePropertyMetaModel = new PropertyMetaModel( - memberValuePairMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + memberValuePairMetaModel.namePropertyMetaModel = new PropertyMetaModel(memberValuePairMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); memberValuePairMetaModel.getDeclaredPropertyMetaModels().add(memberValuePairMetaModel.namePropertyMetaModel); - memberValuePairMetaModel.valuePropertyMetaModel = new PropertyMetaModel( - memberValuePairMetaModel, - "value", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + memberValuePairMetaModel.valuePropertyMetaModel = new PropertyMetaModel(memberValuePairMetaModel, "value", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); memberValuePairMetaModel.getDeclaredPropertyMetaModels().add(memberValuePairMetaModel.valuePropertyMetaModel); - methodCallExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel( - methodCallExprMetaModel, - "arguments", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); + methodCallExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.argumentsPropertyMetaModel); - methodCallExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - methodCallExprMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + methodCallExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.namePropertyMetaModel); - methodCallExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel( - methodCallExprMetaModel, - "scope", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + methodCallExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.scopePropertyMetaModel); - methodCallExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - methodCallExprMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - methodCallExprMetaModel - .getDeclaredPropertyMetaModels() - .add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel); - methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - methodCallExprMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - methodCallExprMetaModel - .getDerivedPropertyMetaModels() - .add(methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel); - methodReferenceExprMetaModel.identifierPropertyMetaModel = new PropertyMetaModel( - methodReferenceExprMetaModel, - "identifier", - java.lang.String.class, - Optional.empty(), - false, - true, - false, - false); - methodReferenceExprMetaModel - .getDeclaredPropertyMetaModels() - .add(methodReferenceExprMetaModel.identifierPropertyMetaModel); - methodReferenceExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel( - methodReferenceExprMetaModel, - "scope", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - methodReferenceExprMetaModel - .getDeclaredPropertyMetaModels() - .add(methodReferenceExprMetaModel.scopePropertyMetaModel); - methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - methodReferenceExprMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - methodReferenceExprMetaModel - .getDeclaredPropertyMetaModels() - .add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel); - methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - methodReferenceExprMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - methodReferenceExprMetaModel - .getDerivedPropertyMetaModels() - .add(methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel); - nameExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - nameExprMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + methodCallExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel); + methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + methodCallExprMetaModel.getDerivedPropertyMetaModels().add(methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel); + methodReferenceExprMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false); + methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.identifierPropertyMetaModel); + methodReferenceExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.scopePropertyMetaModel); + methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel); + methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + methodReferenceExprMetaModel.getDerivedPropertyMetaModels().add(methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel); + nameExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(nameExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); nameExprMetaModel.getDeclaredPropertyMetaModels().add(nameExprMetaModel.namePropertyMetaModel); - nameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel( - nameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false); + nameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false); nameMetaModel.getDeclaredPropertyMetaModels().add(nameMetaModel.identifierPropertyMetaModel); - nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel( - nameMetaModel, - "qualifier", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - true, - false, - false, - false); + nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "qualifier", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false); nameMetaModel.getDeclaredPropertyMetaModels().add(nameMetaModel.qualifierPropertyMetaModel); - normalAnnotationExprMetaModel.pairsPropertyMetaModel = new PropertyMetaModel( - normalAnnotationExprMetaModel, - "pairs", - com.github.javaparser.ast.expr.MemberValuePair.class, - Optional.of(memberValuePairMetaModel), - false, - false, - true, - false); - normalAnnotationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(normalAnnotationExprMetaModel.pairsPropertyMetaModel); - objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "anonymousClassBody", - com.github.javaparser.ast.body.BodyDeclaration.class, - Optional.of(bodyDeclarationMetaModel), - true, - false, - true, - true); - objectCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel); - objectCreationExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "arguments", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); - objectCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(objectCreationExprMetaModel.argumentsPropertyMetaModel); - objectCreationExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "scope", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); - objectCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(objectCreationExprMetaModel.scopePropertyMetaModel); - objectCreationExprMetaModel.typePropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "type", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - false, - false); - objectCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(objectCreationExprMetaModel.typePropertyMetaModel); - objectCreationExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - objectCreationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel); - objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - objectCreationExprMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - objectCreationExprMetaModel - .getDerivedPropertyMetaModels() - .add(objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel); - patternExprMetaModel.typePropertyMetaModel = new PropertyMetaModel( - patternExprMetaModel, - "type", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); + normalAnnotationExprMetaModel.pairsPropertyMetaModel = new PropertyMetaModel(normalAnnotationExprMetaModel, "pairs", com.github.javaparser.ast.expr.MemberValuePair.class, Optional.of(memberValuePairMetaModel), false, false, true, false); + normalAnnotationExprMetaModel.getDeclaredPropertyMetaModels().add(normalAnnotationExprMetaModel.pairsPropertyMetaModel); + objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "anonymousClassBody", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), true, false, true, true); + objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel); + objectCreationExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.argumentsPropertyMetaModel); + objectCreationExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); + objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.scopePropertyMetaModel); + objectCreationExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "type", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, false, false); + objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.typePropertyMetaModel); + objectCreationExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel); + objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + objectCreationExprMetaModel.getDerivedPropertyMetaModels().add(objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel); + patternExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(patternExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); patternExprMetaModel.getDeclaredPropertyMetaModels().add(patternExprMetaModel.typePropertyMetaModel); - recordPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - recordPatternExprMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - recordPatternExprMetaModel - .getDeclaredPropertyMetaModels() - .add(recordPatternExprMetaModel.modifiersPropertyMetaModel); - recordPatternExprMetaModel.patternListPropertyMetaModel = new PropertyMetaModel( - recordPatternExprMetaModel, - "patternList", - com.github.javaparser.ast.expr.PatternExpr.class, - Optional.of(patternExprMetaModel), - false, - false, - true, - false); - recordPatternExprMetaModel - .getDeclaredPropertyMetaModels() - .add(recordPatternExprMetaModel.patternListPropertyMetaModel); - 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); - simpleNameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel( - simpleNameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false); + recordPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(recordPatternExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + recordPatternExprMetaModel.getDeclaredPropertyMetaModels().add(recordPatternExprMetaModel.modifiersPropertyMetaModel); + recordPatternExprMetaModel.patternListPropertyMetaModel = new PropertyMetaModel(recordPatternExprMetaModel, "patternList", com.github.javaparser.ast.expr.PatternExpr.class, Optional.of(patternExprMetaModel), false, false, true, false); + recordPatternExprMetaModel.getDeclaredPropertyMetaModels().add(recordPatternExprMetaModel.patternListPropertyMetaModel); + 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); + simpleNameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(simpleNameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false); simpleNameMetaModel.getDeclaredPropertyMetaModels().add(simpleNameMetaModel.identifierPropertyMetaModel); - superExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel( - superExprMetaModel, - "typeName", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - true, - false, - false, - false); + 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); - switchExprMetaModel.entriesPropertyMetaModel = new PropertyMetaModel( - switchExprMetaModel, - "entries", - com.github.javaparser.ast.stmt.SwitchEntry.class, - Optional.of(switchEntryMetaModel), - false, - false, - true, - false); + switchExprMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(switchExprMetaModel, "entries", com.github.javaparser.ast.stmt.SwitchEntry.class, Optional.of(switchEntryMetaModel), false, false, true, false); switchExprMetaModel.getDeclaredPropertyMetaModels().add(switchExprMetaModel.entriesPropertyMetaModel); - switchExprMetaModel.selectorPropertyMetaModel = new PropertyMetaModel( - switchExprMetaModel, - "selector", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + switchExprMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(switchExprMetaModel, "selector", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); switchExprMetaModel.getDeclaredPropertyMetaModels().add(switchExprMetaModel.selectorPropertyMetaModel); - thisExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel( - thisExprMetaModel, - "typeName", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - true, - false, - false, - false); + 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.typePropertyMetaModel = new PropertyMetaModel(typeExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); typeExprMetaModel.getDeclaredPropertyMetaModels().add(typeExprMetaModel.typePropertyMetaModel); - typePatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - typePatternExprMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - typePatternExprMetaModel - .getDeclaredPropertyMetaModels() - .add(typePatternExprMetaModel.modifiersPropertyMetaModel); - typePatternExprMetaModel.namePropertyMetaModel = new PropertyMetaModel( - typePatternExprMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + typePatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(typePatternExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + typePatternExprMetaModel.getDeclaredPropertyMetaModels().add(typePatternExprMetaModel.modifiersPropertyMetaModel); + typePatternExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(typePatternExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); typePatternExprMetaModel.getDeclaredPropertyMetaModels().add(typePatternExprMetaModel.namePropertyMetaModel); - unaryExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - unaryExprMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + unaryExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); unaryExprMetaModel.getDeclaredPropertyMetaModels().add(unaryExprMetaModel.expressionPropertyMetaModel); - unaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel( - unaryExprMetaModel, - "operator", - com.github.javaparser.ast.expr.UnaryExpr.Operator.class, - Optional.empty(), - false, - false, - false, - false); + unaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "operator", com.github.javaparser.ast.expr.UnaryExpr.Operator.class, Optional.empty(), false, false, false, false); unaryExprMetaModel.getDeclaredPropertyMetaModels().add(unaryExprMetaModel.operatorPropertyMetaModel); - unaryExprMetaModel.postfixPropertyMetaModel = new PropertyMetaModel( - unaryExprMetaModel, "postfix", boolean.class, Optional.empty(), false, false, false, false); + unaryExprMetaModel.postfixPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "postfix", boolean.class, Optional.empty(), false, false, false, false); unaryExprMetaModel.getDerivedPropertyMetaModels().add(unaryExprMetaModel.postfixPropertyMetaModel); - unaryExprMetaModel.prefixPropertyMetaModel = new PropertyMetaModel( - unaryExprMetaModel, "prefix", boolean.class, Optional.empty(), false, false, false, false); + unaryExprMetaModel.prefixPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "prefix", boolean.class, Optional.empty(), false, false, false, false); unaryExprMetaModel.getDerivedPropertyMetaModels().add(unaryExprMetaModel.prefixPropertyMetaModel); - variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel( - variableDeclarationExprMetaModel, - "annotations", - com.github.javaparser.ast.expr.AnnotationExpr.class, - Optional.of(annotationExprMetaModel), - false, - false, - true, - false); - variableDeclarationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel); - variableDeclarationExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - variableDeclarationExprMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - variableDeclarationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel); - variableDeclarationExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel( - variableDeclarationExprMetaModel, - "variables", - com.github.javaparser.ast.body.VariableDeclarator.class, - Optional.of(variableDeclaratorMetaModel), - false, - true, - true, - false); - variableDeclarationExprMetaModel - .getDeclaredPropertyMetaModels() - .add(variableDeclarationExprMetaModel.variablesPropertyMetaModel); - variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel( - variableDeclarationExprMetaModel, - "maximumCommonType", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - false, - false); - variableDeclarationExprMetaModel - .getDerivedPropertyMetaModels() - .add(variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel); - assertStmtMetaModel.checkPropertyMetaModel = new PropertyMetaModel( - assertStmtMetaModel, - "check", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false); + variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel); + variableDeclarationExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel); + variableDeclarationExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "variables", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, true, true, false); + variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.variablesPropertyMetaModel); + variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "maximumCommonType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false); + variableDeclarationExprMetaModel.getDerivedPropertyMetaModels().add(variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel); + jmlDocMetaModel.contentPropertyMetaModel = new PropertyMetaModel(jmlDocMetaModel, "content", com.github.javaparser.JavaToken.class, Optional.empty(), false, false, false, false); + jmlDocMetaModel.getDeclaredPropertyMetaModels().add(jmlDocMetaModel.contentPropertyMetaModel); + jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocDeclarationMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false); + jmlDocDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel); + jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocStmtMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false); + jmlDocStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel); + jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocTypeMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false); + jmlDocTypeMetaModel.getDeclaredPropertyMetaModels().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel); + jmlQuantifiedExprMetaModel.binderPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "binder", com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr.JmlBinder.class, Optional.empty(), false, false, false, false); + jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel); + jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, true, true, false); + jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel); + jmlQuantifiedExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "variables", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, true, true, false); + jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel); + jmlTypeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(jmlTypeExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); + jmlTypeExprMetaModel.getDeclaredPropertyMetaModels().add(jmlTypeExprMetaModel.typePropertyMetaModel); + jmlBinaryInfixExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "left", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel); + jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "operator", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel); + jmlBinaryInfixExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "right", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel); + jmlLetExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(jmlLetExprMetaModel, "body", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.bodyPropertyMetaModel); + jmlLetExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(jmlLetExprMetaModel, "variables", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false); + jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.variablesPropertyMetaModel); + jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlMultiCompareExprMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, true, true, false); + jmlMultiCompareExprMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel); + jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel = new PropertyMetaModel(jmlMultiCompareExprMetaModel, "operators", com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr.Operators.class, Optional.empty(), false, false, false, false); + jmlMultiCompareExprMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel); + jmlLabelExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.expressionPropertyMetaModel); + jmlLabelExprMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "kind", com.github.javaparser.ast.jml.expr.JmlLabelExpr.Kind.class, Optional.empty(), false, false, false, false); + jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.kindPropertyMetaModel); + jmlLabelExprMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.labelPropertyMetaModel); + jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel = new PropertyMetaModel(jmlSetComprehensionExprMetaModel, "binding", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, false, false, false); + jmlSetComprehensionExprMetaModel.getDeclaredPropertyMetaModels().add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel); + jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel = new PropertyMetaModel(jmlSetComprehensionExprMetaModel, "predicate", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlSetComprehensionExprMetaModel.getDeclaredPropertyMetaModels().add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel); + assertStmtMetaModel.checkPropertyMetaModel = new PropertyMetaModel(assertStmtMetaModel, "check", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); assertStmtMetaModel.getDeclaredPropertyMetaModels().add(assertStmtMetaModel.checkPropertyMetaModel); - assertStmtMetaModel.messagePropertyMetaModel = new PropertyMetaModel( - assertStmtMetaModel, - "message", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + assertStmtMetaModel.messagePropertyMetaModel = new PropertyMetaModel(assertStmtMetaModel, "message", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); assertStmtMetaModel.getDeclaredPropertyMetaModels().add(assertStmtMetaModel.messagePropertyMetaModel); - blockStmtMetaModel.statementsPropertyMetaModel = new PropertyMetaModel( - blockStmtMetaModel, - "statements", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - true, - false); + blockStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(blockStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + blockStmtMetaModel.getDeclaredPropertyMetaModels().add(blockStmtMetaModel.contractsPropertyMetaModel); + blockStmtMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(blockStmtMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false); blockStmtMetaModel.getDeclaredPropertyMetaModels().add(blockStmtMetaModel.statementsPropertyMetaModel); - breakStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel( - breakStmtMetaModel, - "label", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - true, - false, - false, - false); + breakStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(breakStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); breakStmtMetaModel.getDeclaredPropertyMetaModels().add(breakStmtMetaModel.labelPropertyMetaModel); - catchClauseMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - catchClauseMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); + catchClauseMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(catchClauseMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); catchClauseMetaModel.getDeclaredPropertyMetaModels().add(catchClauseMetaModel.bodyPropertyMetaModel); - catchClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel( - catchClauseMetaModel, - "parameter", - com.github.javaparser.ast.body.Parameter.class, - Optional.of(parameterMetaModel), - false, - false, - false, - false); + catchClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(catchClauseMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, false, false); catchClauseMetaModel.getDeclaredPropertyMetaModels().add(catchClauseMetaModel.parameterPropertyMetaModel); - continueStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel( - continueStmtMetaModel, - "label", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - true, - false, - false, - false); + continueStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(continueStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); continueStmtMetaModel.getDeclaredPropertyMetaModels().add(continueStmtMetaModel.labelPropertyMetaModel); - doStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - doStmtMetaModel, - "body", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + doStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.bodyPropertyMetaModel); - doStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel( - doStmtMetaModel, - "condition", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + doStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.conditionPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel( - explicitConstructorInvocationStmtMetaModel, - "arguments", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); - explicitConstructorInvocationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - explicitConstructorInvocationStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); - explicitConstructorInvocationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel = new PropertyMetaModel( - explicitConstructorInvocationStmtMetaModel, - "isThis", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - explicitConstructorInvocationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - explicitConstructorInvocationStmtMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - explicitConstructorInvocationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel); - explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - explicitConstructorInvocationStmtMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - explicitConstructorInvocationStmtMetaModel - .getDerivedPropertyMetaModels() - .add(explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel); - expressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - expressionStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - expressionStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(expressionStmtMetaModel.expressionPropertyMetaModel); - forEachStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - forEachStmtMetaModel, - "body", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + doStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.contractsPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); + explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "isThis", boolean.class, Optional.empty(), false, false, false, false); + explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel); + explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + explicitConstructorInvocationStmtMetaModel.getDerivedPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel); + expressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(expressionStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + expressionStmtMetaModel.getDeclaredPropertyMetaModels().add(expressionStmtMetaModel.expressionPropertyMetaModel); + forEachStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.bodyPropertyMetaModel); - forEachStmtMetaModel.iterablePropertyMetaModel = new PropertyMetaModel( - forEachStmtMetaModel, - "iterable", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + forEachStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.contractsPropertyMetaModel); + forEachStmtMetaModel.iterablePropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "iterable", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.iterablePropertyMetaModel); - forEachStmtMetaModel.variablePropertyMetaModel = new PropertyMetaModel( - forEachStmtMetaModel, - "variable", - com.github.javaparser.ast.expr.VariableDeclarationExpr.class, - Optional.of(variableDeclarationExprMetaModel), - false, - false, - false, - false); + forEachStmtMetaModel.variablePropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "variable", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false); forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.variablePropertyMetaModel); - forStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - forStmtMetaModel, - "body", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + forStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.bodyPropertyMetaModel); - forStmtMetaModel.comparePropertyMetaModel = new PropertyMetaModel( - forStmtMetaModel, - "compare", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + forStmtMetaModel.comparePropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "compare", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.comparePropertyMetaModel); - forStmtMetaModel.initializationPropertyMetaModel = new PropertyMetaModel( - forStmtMetaModel, - "initialization", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); + forStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.contractsPropertyMetaModel); + forStmtMetaModel.initializationPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "initialization", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.initializationPropertyMetaModel); - forStmtMetaModel.updatePropertyMetaModel = new PropertyMetaModel( - forStmtMetaModel, - "update", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); + forStmtMetaModel.updatePropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "update", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.updatePropertyMetaModel); - ifStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, - "condition", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + ifStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.conditionPropertyMetaModel); - ifStmtMetaModel.elseStmtPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, - "elseStmt", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - true, - false, - false, - false); + ifStmtMetaModel.elseStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseStmt", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), true, false, false, false); ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.elseStmtPropertyMetaModel); - ifStmtMetaModel.thenStmtPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, - "thenStmt", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + ifStmtMetaModel.thenStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "thenStmt", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.thenStmtPropertyMetaModel); - ifStmtMetaModel.cascadingIfStmtPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, "cascadingIfStmt", boolean.class, Optional.empty(), false, false, false, false); + ifStmtMetaModel.cascadingIfStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "cascadingIfStmt", boolean.class, Optional.empty(), false, false, false, false); ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.cascadingIfStmtPropertyMetaModel); - ifStmtMetaModel.elseBlockPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, "elseBlock", boolean.class, Optional.empty(), false, false, false, false); + ifStmtMetaModel.elseBlockPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseBlock", boolean.class, Optional.empty(), false, false, false, false); ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.elseBlockPropertyMetaModel); - ifStmtMetaModel.elseBranchPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, "elseBranch", boolean.class, Optional.empty(), false, false, false, false); + ifStmtMetaModel.elseBranchPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseBranch", boolean.class, Optional.empty(), false, false, false, false); ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.elseBranchPropertyMetaModel); - ifStmtMetaModel.thenBlockPropertyMetaModel = new PropertyMetaModel( - ifStmtMetaModel, "thenBlock", boolean.class, Optional.empty(), false, false, false, false); + ifStmtMetaModel.thenBlockPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "thenBlock", boolean.class, Optional.empty(), false, false, false, false); ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.thenBlockPropertyMetaModel); - labeledStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel( - labeledStmtMetaModel, - "label", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + labeledStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(labeledStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); labeledStmtMetaModel.getDeclaredPropertyMetaModels().add(labeledStmtMetaModel.labelPropertyMetaModel); - labeledStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel( - labeledStmtMetaModel, - "statement", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + labeledStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(labeledStmtMetaModel, "statement", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); labeledStmtMetaModel.getDeclaredPropertyMetaModels().add(labeledStmtMetaModel.statementPropertyMetaModel); - localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel = new PropertyMetaModel( - localClassDeclarationStmtMetaModel, - "classDeclaration", - com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class, - Optional.of(classOrInterfaceDeclarationMetaModel), - false, - false, - false, - false); - localClassDeclarationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel); - localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel = new PropertyMetaModel( - localRecordDeclarationStmtMetaModel, - "recordDeclaration", - com.github.javaparser.ast.body.RecordDeclaration.class, - Optional.of(recordDeclarationMetaModel), - false, - false, - false, - false); - localRecordDeclarationStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel); - returnStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - returnStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel = new PropertyMetaModel(localClassDeclarationStmtMetaModel, "classDeclaration", com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class, Optional.of(classOrInterfaceDeclarationMetaModel), false, false, false, false); + localClassDeclarationStmtMetaModel.getDeclaredPropertyMetaModels().add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel); + localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel = new PropertyMetaModel(localRecordDeclarationStmtMetaModel, "recordDeclaration", com.github.javaparser.ast.body.RecordDeclaration.class, Optional.of(recordDeclarationMetaModel), false, false, false, false); + localRecordDeclarationStmtMetaModel.getDeclaredPropertyMetaModels().add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel); + returnStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(returnStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); returnStmtMetaModel.getDeclaredPropertyMetaModels().add(returnStmtMetaModel.expressionPropertyMetaModel); - switchEntryMetaModel.guardPropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, - "guard", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - true, - false, - false, - false); + switchEntryMetaModel.guardPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "guard", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.guardPropertyMetaModel); - switchEntryMetaModel.isDefaultPropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, "isDefault", boolean.class, Optional.empty(), false, false, false, false); + switchEntryMetaModel.isDefaultPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "isDefault", boolean.class, Optional.empty(), false, false, false, false); switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.isDefaultPropertyMetaModel); - switchEntryMetaModel.labelsPropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, - "labels", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); + switchEntryMetaModel.labelsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "labels", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.labelsPropertyMetaModel); - switchEntryMetaModel.statementsPropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, - "statements", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - true, - false); + switchEntryMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false); switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.statementsPropertyMetaModel); - switchEntryMetaModel.typePropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, - "type", - com.github.javaparser.ast.stmt.SwitchEntry.Type.class, - Optional.empty(), - false, - false, - false, - false); + switchEntryMetaModel.typePropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "type", com.github.javaparser.ast.stmt.SwitchEntry.Type.class, Optional.empty(), false, false, false, false); switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.typePropertyMetaModel); - switchEntryMetaModel.switchStatementEntryPropertyMetaModel = new PropertyMetaModel( - switchEntryMetaModel, - "switchStatementEntry", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - switchEntryMetaModel - .getDerivedPropertyMetaModels() - .add(switchEntryMetaModel.switchStatementEntryPropertyMetaModel); - switchStmtMetaModel.entriesPropertyMetaModel = new PropertyMetaModel( - switchStmtMetaModel, - "entries", - com.github.javaparser.ast.stmt.SwitchEntry.class, - Optional.of(switchEntryMetaModel), - false, - false, - true, - false); + switchEntryMetaModel.switchStatementEntryPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "switchStatementEntry", boolean.class, Optional.empty(), false, false, false, false); + switchEntryMetaModel.getDerivedPropertyMetaModels().add(switchEntryMetaModel.switchStatementEntryPropertyMetaModel); + switchStmtMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(switchStmtMetaModel, "entries", com.github.javaparser.ast.stmt.SwitchEntry.class, Optional.of(switchEntryMetaModel), false, false, true, false); switchStmtMetaModel.getDeclaredPropertyMetaModels().add(switchStmtMetaModel.entriesPropertyMetaModel); - switchStmtMetaModel.selectorPropertyMetaModel = new PropertyMetaModel( - switchStmtMetaModel, - "selector", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + switchStmtMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(switchStmtMetaModel, "selector", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); switchStmtMetaModel.getDeclaredPropertyMetaModels().add(switchStmtMetaModel.selectorPropertyMetaModel); - synchronizedStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - synchronizedStmtMetaModel, - "body", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); + synchronizedStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(synchronizedStmtMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); synchronizedStmtMetaModel.getDeclaredPropertyMetaModels().add(synchronizedStmtMetaModel.bodyPropertyMetaModel); - synchronizedStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - synchronizedStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); - synchronizedStmtMetaModel - .getDeclaredPropertyMetaModels() - .add(synchronizedStmtMetaModel.expressionPropertyMetaModel); - throwStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - throwStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + synchronizedStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(synchronizedStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + synchronizedStmtMetaModel.getDeclaredPropertyMetaModels().add(synchronizedStmtMetaModel.expressionPropertyMetaModel); + throwStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(throwStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); throwStmtMetaModel.getDeclaredPropertyMetaModels().add(throwStmtMetaModel.expressionPropertyMetaModel); - tryStmtMetaModel.catchClausesPropertyMetaModel = new PropertyMetaModel( - tryStmtMetaModel, - "catchClauses", - com.github.javaparser.ast.stmt.CatchClause.class, - Optional.of(catchClauseMetaModel), - false, - false, - true, - false); + tryStmtMetaModel.catchClausesPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "catchClauses", com.github.javaparser.ast.stmt.CatchClause.class, Optional.of(catchClauseMetaModel), false, false, true, false); tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.catchClausesPropertyMetaModel); - tryStmtMetaModel.finallyBlockPropertyMetaModel = new PropertyMetaModel( - tryStmtMetaModel, - "finallyBlock", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - true, - false, - false, - false); + tryStmtMetaModel.finallyBlockPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "finallyBlock", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false); tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.finallyBlockPropertyMetaModel); - tryStmtMetaModel.resourcesPropertyMetaModel = new PropertyMetaModel( - tryStmtMetaModel, - "resources", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - true, - false); + tryStmtMetaModel.resourcesPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "resources", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.resourcesPropertyMetaModel); - tryStmtMetaModel.tryBlockPropertyMetaModel = new PropertyMetaModel( - tryStmtMetaModel, - "tryBlock", - com.github.javaparser.ast.stmt.BlockStmt.class, - Optional.of(blockStmtMetaModel), - false, - false, - false, - false); + tryStmtMetaModel.tryBlockPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "tryBlock", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false); tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.tryBlockPropertyMetaModel); - whileStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel( - whileStmtMetaModel, - "body", - com.github.javaparser.ast.stmt.Statement.class, - Optional.of(statementMetaModel), - false, - false, - false, - false); + whileStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.bodyPropertyMetaModel); - whileStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel( - whileStmtMetaModel, - "condition", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + whileStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.conditionPropertyMetaModel); - yieldStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel( - yieldStmtMetaModel, - "expression", - com.github.javaparser.ast.expr.Expression.class, - Optional.of(expressionMetaModel), - false, - false, - false, - false); + whileStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.contractsPropertyMetaModel); + yieldStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(yieldStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); yieldStmtMetaModel.getDeclaredPropertyMetaModels().add(yieldStmtMetaModel.expressionPropertyMetaModel); - arrayTypeMetaModel.componentTypePropertyMetaModel = new PropertyMetaModel( - arrayTypeMetaModel, - "componentType", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - false, - false, - false, - false); + jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlGhostStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlGhostStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel); + jmlGhostStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(jmlGhostStmtMetaModel, "statement", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false); + jmlGhostStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlGhostStmtMetaModel.statementPropertyMetaModel); + jmlExpressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel); + jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel); + jmlExpressionStmtMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "kind", com.github.javaparser.ast.jml.stmt.JmlExpressionStmt.JmlStmtKind.class, Optional.empty(), false, false, false, false); + jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.kindPropertyMetaModel); + jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlRefiningStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlRefiningStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel); + jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlUnreachableStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlUnreachableStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel); + jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlLabelStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlLabelStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel); + jmlLabelStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlLabelStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + jmlLabelStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelStmtMetaModel.labelPropertyMetaModel); + jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlBeginStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlBeginStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel); + jmlEndStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlEndStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlEndStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlEndStmtMetaModel.jmlTagsPropertyMetaModel); + jmlMethodDeclarationMetaModel.contractPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "contract", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), true, false, false, false); + jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel); + jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "methodDeclaration", com.github.javaparser.ast.body.MethodDeclaration.class, Optional.of(methodDeclarationMetaModel), false, false, false, false); + jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel); + jmlFieldDeclarationMetaModel.declPropertyMetaModel = new PropertyMetaModel(jmlFieldDeclarationMetaModel, "decl", com.github.javaparser.ast.body.FieldDeclaration.class, Optional.of(fieldDeclarationMetaModel), false, false, false, false); + jmlFieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlFieldDeclarationMetaModel.declPropertyMetaModel); + jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlFieldDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlFieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlClauseMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlClauseMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); + jmlClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseMetaModel.namePropertyMetaModel); + jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel); + jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "heaps", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, true, false); + jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel); + jmlSimpleExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false); + jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.kindPropertyMetaModel); + jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel); + jmlMultiExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "heaps", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, true, false); + jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.heapsPropertyMetaModel); + jmlMultiExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false); + jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.kindPropertyMetaModel); + jmlSignalsClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlSignalsClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlSignalsClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsClauseMetaModel.expressionPropertyMetaModel); + jmlSignalsClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(jmlSignalsClauseMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, false, false); + jmlSignalsClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsClauseMetaModel.parameterPropertyMetaModel); + jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel = new PropertyMetaModel(jmlSignalsOnlyClauseMetaModel, "types", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, true, false); + jmlSignalsOnlyClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel); + jmlClauseLabelMetaModel.exprPropertyMetaModel = new PropertyMetaModel(jmlClauseLabelMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.exprPropertyMetaModel); + jmlClauseLabelMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlClauseLabelMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false); + jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.kindPropertyMetaModel); + jmlClauseLabelMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlClauseLabelMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); + jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.labelPropertyMetaModel); + jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel = new PropertyMetaModel(jmlForallClauseMetaModel, "boundedVariables", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false); + jmlForallClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel); + jmlOldClauseMetaModel.declarationsPropertyMetaModel = new PropertyMetaModel(jmlOldClauseMetaModel, "declarations", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false); + jmlOldClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlOldClauseMetaModel.declarationsPropertyMetaModel); + jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel = new PropertyMetaModel(jmlCallableClauseMetaModel, "methodSignatures", com.github.javaparser.ast.jml.clauses.JmlMethodSignature.class, Optional.of(jmlMethodSignatureMetaModel), false, false, true, false); + jmlCallableClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel); + jmlClauseIfMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(jmlClauseIfMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.conditionPropertyMetaModel); + jmlClauseIfMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlClauseIfMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false); + jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.kindPropertyMetaModel); + jmlClauseIfMetaModel.thenPropertyMetaModel = new PropertyMetaModel(jmlClauseIfMetaModel, "then", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.thenPropertyMetaModel); + jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "argumentTypes", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, true, false); + jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel); + jmlMethodSignatureMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.namePropertyMetaModel); + jmlMethodSignatureMetaModel.receiverPropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "receiver", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false); + jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel); + jmlContractMetaModel.behaviorPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "behavior", com.github.javaparser.ast.stmt.Behavior.class, Optional.empty(), false, false, false, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.behaviorPropertyMetaModel); + jmlContractMetaModel.clausesPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "clauses", com.github.javaparser.ast.jml.clauses.JmlClause.class, Optional.of(jmlClauseMetaModel), false, false, true, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.clausesPropertyMetaModel); + jmlContractMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.jmlTagsPropertyMetaModel); + jmlContractMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.modifiersPropertyMetaModel); + jmlContractMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.namePropertyMetaModel); + jmlContractMetaModel.subContractsPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "subContracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.subContractsPropertyMetaModel); + jmlContractMetaModel.typePropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "type", com.github.javaparser.ast.jml.clauses.ContractType.class, Optional.empty(), false, false, false, false); + jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.typePropertyMetaModel); + jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "invariant", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel); + jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlClassExprDeclarationMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "kind", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel); + jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel); + jmlClassExprDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false); + jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel); + jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel); + jmlRepresentsDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false); + jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false); + jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "measuredBy", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false); + jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel); + jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "variable", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false); + jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel); + arrayTypeMetaModel.componentTypePropertyMetaModel = new PropertyMetaModel(arrayTypeMetaModel, "componentType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false); arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.componentTypePropertyMetaModel); - arrayTypeMetaModel.originPropertyMetaModel = new PropertyMetaModel( - arrayTypeMetaModel, - "origin", - com.github.javaparser.ast.type.ArrayType.Origin.class, - Optional.empty(), - false, - false, - false, - false); + arrayTypeMetaModel.originPropertyMetaModel = new PropertyMetaModel(arrayTypeMetaModel, "origin", com.github.javaparser.ast.type.ArrayType.Origin.class, Optional.empty(), false, false, false, false); arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.originPropertyMetaModel); - classOrInterfaceTypeMetaModel.namePropertyMetaModel = new PropertyMetaModel( - classOrInterfaceTypeMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); - classOrInterfaceTypeMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceTypeMetaModel.namePropertyMetaModel); - classOrInterfaceTypeMetaModel.scopePropertyMetaModel = new PropertyMetaModel( - classOrInterfaceTypeMetaModel, - "scope", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - true, - false, - false, - false); - classOrInterfaceTypeMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel); - classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceTypeMetaModel, - "typeArguments", - com.github.javaparser.ast.type.Type.class, - Optional.of(typeMetaModel), - true, - false, - true, - false); - classOrInterfaceTypeMetaModel - .getDeclaredPropertyMetaModels() - .add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel); - classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel( - classOrInterfaceTypeMetaModel, - "usingDiamondOperator", - boolean.class, - Optional.empty(), - false, - false, - false, - false); - classOrInterfaceTypeMetaModel - .getDerivedPropertyMetaModels() - .add(classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel); - intersectionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel( - intersectionTypeMetaModel, - "elements", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - false, - true, - true, - false); - intersectionTypeMetaModel - .getDeclaredPropertyMetaModels() - .add(intersectionTypeMetaModel.elementsPropertyMetaModel); - primitiveTypeMetaModel.typePropertyMetaModel = new PropertyMetaModel( - primitiveTypeMetaModel, - "type", - com.github.javaparser.ast.type.PrimitiveType.Primitive.class, - Optional.empty(), - false, - false, - false, - false); + classOrInterfaceTypeMetaModel.namePropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); + classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.namePropertyMetaModel); + classOrInterfaceTypeMetaModel.scopePropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "scope", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), true, false, false, false); + classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel); + classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false); + classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel); + classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false); + classOrInterfaceTypeMetaModel.getDerivedPropertyMetaModels().add(classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel); + intersectionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(intersectionTypeMetaModel, "elements", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, true, true, false); + intersectionTypeMetaModel.getDeclaredPropertyMetaModels().add(intersectionTypeMetaModel.elementsPropertyMetaModel); + primitiveTypeMetaModel.typePropertyMetaModel = new PropertyMetaModel(primitiveTypeMetaModel, "type", com.github.javaparser.ast.type.PrimitiveType.Primitive.class, Optional.empty(), false, false, false, false); primitiveTypeMetaModel.getDeclaredPropertyMetaModels().add(primitiveTypeMetaModel.typePropertyMetaModel); - typeParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel( - typeParameterMetaModel, - "name", - com.github.javaparser.ast.expr.SimpleName.class, - Optional.of(simpleNameMetaModel), - false, - false, - false, - false); + typeParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(typeParameterMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false); typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.namePropertyMetaModel); - typeParameterMetaModel.typeBoundPropertyMetaModel = new PropertyMetaModel( - typeParameterMetaModel, - "typeBound", - com.github.javaparser.ast.type.ClassOrInterfaceType.class, - Optional.of(classOrInterfaceTypeMetaModel), - false, - false, - true, - false); + typeParameterMetaModel.typeBoundPropertyMetaModel = new PropertyMetaModel(typeParameterMetaModel, "typeBound", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false); typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.typeBoundPropertyMetaModel); - unionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel( - unionTypeMetaModel, - "elements", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - false, - true, - true, - false); + unionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(unionTypeMetaModel, "elements", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, true, true, false); unionTypeMetaModel.getDeclaredPropertyMetaModels().add(unionTypeMetaModel.elementsPropertyMetaModel); - wildcardTypeMetaModel.extendedTypePropertyMetaModel = new PropertyMetaModel( - wildcardTypeMetaModel, - "extendedType", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - true, - false, - false, - false); + wildcardTypeMetaModel.extendedTypePropertyMetaModel = new PropertyMetaModel(wildcardTypeMetaModel, "extendedType", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), true, false, false, false); wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel); - wildcardTypeMetaModel.superTypePropertyMetaModel = new PropertyMetaModel( - wildcardTypeMetaModel, - "superType", - com.github.javaparser.ast.type.ReferenceType.class, - Optional.of(referenceTypeMetaModel), - true, - false, - false, - false); + wildcardTypeMetaModel.superTypePropertyMetaModel = new PropertyMetaModel(wildcardTypeMetaModel, "superType", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), true, false, false, false); wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.superTypePropertyMetaModel); - moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel( - moduleExportsDirectiveMetaModel, - "moduleNames", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - true, - false); - moduleExportsDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel); - moduleExportsDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleExportsDirectiveMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleExportsDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleExportsDirectiveMetaModel.namePropertyMetaModel); - moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel( - moduleOpensDirectiveMetaModel, - "moduleNames", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - true, - false); - moduleOpensDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel); - moduleOpensDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleOpensDirectiveMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleOpensDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleOpensDirectiveMetaModel.namePropertyMetaModel); - moduleProvidesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleProvidesDirectiveMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleProvidesDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel); - moduleProvidesDirectiveMetaModel.withPropertyMetaModel = new PropertyMetaModel( - moduleProvidesDirectiveMetaModel, - "with", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - true, - false); - moduleProvidesDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel); - moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel( - moduleRequiresDirectiveMetaModel, - "modifiers", - com.github.javaparser.ast.Modifier.class, - Optional.of(modifierMetaModel), - false, - false, - true, - false); - moduleRequiresDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel); - moduleRequiresDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleRequiresDirectiveMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleRequiresDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel); - moduleUsesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel( - moduleUsesDirectiveMetaModel, - "name", - com.github.javaparser.ast.expr.Name.class, - Optional.of(nameMetaModel), - false, - false, - false, - false); - moduleUsesDirectiveMetaModel - .getDeclaredPropertyMetaModels() - .add(moduleUsesDirectiveMetaModel.namePropertyMetaModel); + moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(moduleExportsDirectiveMetaModel, "moduleNames", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false); + moduleExportsDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel); + moduleExportsDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleExportsDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleExportsDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleExportsDirectiveMetaModel.namePropertyMetaModel); + moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(moduleOpensDirectiveMetaModel, "moduleNames", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false); + moduleOpensDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel); + moduleOpensDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleOpensDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleOpensDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleOpensDirectiveMetaModel.namePropertyMetaModel); + moduleProvidesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleProvidesDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleProvidesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel); + moduleProvidesDirectiveMetaModel.withPropertyMetaModel = new PropertyMetaModel(moduleProvidesDirectiveMetaModel, "with", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false); + moduleProvidesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel); + moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(moduleRequiresDirectiveMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false); + moduleRequiresDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel); + moduleRequiresDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleRequiresDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleRequiresDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel); + moduleUsesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleUsesDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false); + moduleUsesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleUsesDirectiveMetaModel.namePropertyMetaModel); } public static Optional getNodeMetaModel(Class c) { @@ -2966,12 +1184,10 @@ public static Optional getNodeMetaModel(Class c) { public static final NodeMetaModel nodeMetaModel = new NodeMetaModel(Optional.empty()); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final BodyDeclarationMetaModel bodyDeclarationMetaModel = - new BodyDeclarationMetaModel(Optional.of(nodeMetaModel)); + public static final BodyDeclarationMetaModel bodyDeclarationMetaModel = new BodyDeclarationMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final CallableDeclarationMetaModel callableDeclarationMetaModel = - new CallableDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final CallableDeclarationMetaModel callableDeclarationMetaModel = new CallableDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ExpressionMetaModel expressionMetaModel = new ExpressionMetaModel(Optional.of(nodeMetaModel)); @@ -2983,208 +1199,160 @@ public static Optional getNodeMetaModel(Class c) { public static final TypeMetaModel typeMetaModel = new TypeMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final AnnotationExprMetaModel annotationExprMetaModel = - new AnnotationExprMetaModel(Optional.of(expressionMetaModel)); + public static final AnnotationExprMetaModel annotationExprMetaModel = new AnnotationExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ReferenceTypeMetaModel referenceTypeMetaModel = - new ReferenceTypeMetaModel(Optional.of(typeMetaModel)); + public static final ReferenceTypeMetaModel referenceTypeMetaModel = new ReferenceTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final TypeDeclarationMetaModel typeDeclarationMetaModel = - new TypeDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final TypeDeclarationMetaModel typeDeclarationMetaModel = new TypeDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LiteralExprMetaModel literalExprMetaModel = - new LiteralExprMetaModel(Optional.of(expressionMetaModel)); + public static final LiteralExprMetaModel literalExprMetaModel = new LiteralExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LiteralStringValueExprMetaModel literalStringValueExprMetaModel = - new LiteralStringValueExprMetaModel(Optional.of(literalExprMetaModel)); + public static final LiteralStringValueExprMetaModel literalStringValueExprMetaModel = new LiteralStringValueExprMetaModel(Optional.of(literalExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final StringLiteralExprMetaModel stringLiteralExprMetaModel = - new StringLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final StringLiteralExprMetaModel stringLiteralExprMetaModel = new StringLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleDeclarationMetaModel moduleDeclarationMetaModel = - new ModuleDeclarationMetaModel(Optional.of(nodeMetaModel)); + public static final ModuleDeclarationMetaModel moduleDeclarationMetaModel = new ModuleDeclarationMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleDirectiveMetaModel moduleDirectiveMetaModel = - new ModuleDirectiveMetaModel(Optional.of(nodeMetaModel)); + public static final ModuleDirectiveMetaModel moduleDirectiveMetaModel = new ModuleDirectiveMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ArrayCreationLevelMetaModel arrayCreationLevelMetaModel = - new ArrayCreationLevelMetaModel(Optional.of(nodeMetaModel)); + public static final ArrayCreationLevelMetaModel arrayCreationLevelMetaModel = new ArrayCreationLevelMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final CompilationUnitMetaModel compilationUnitMetaModel = - new CompilationUnitMetaModel(Optional.of(nodeMetaModel)); + public static final CompilationUnitMetaModel compilationUnitMetaModel = new CompilationUnitMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ImportDeclarationMetaModel importDeclarationMetaModel = - new ImportDeclarationMetaModel(Optional.of(nodeMetaModel)); + public static final ImportDeclarationMetaModel importDeclarationMetaModel = new ImportDeclarationMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ModifierMetaModel modifierMetaModel = new ModifierMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final PackageDeclarationMetaModel packageDeclarationMetaModel = - new PackageDeclarationMetaModel(Optional.of(nodeMetaModel)); + public static final PackageDeclarationMetaModel packageDeclarationMetaModel = new PackageDeclarationMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final AnnotationDeclarationMetaModel annotationDeclarationMetaModel = - new AnnotationDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); + public static final AnnotationDeclarationMetaModel annotationDeclarationMetaModel = new AnnotationDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final AnnotationMemberDeclarationMetaModel annotationMemberDeclarationMetaModel = - new AnnotationMemberDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final AnnotationMemberDeclarationMetaModel annotationMemberDeclarationMetaModel = new AnnotationMemberDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ClassOrInterfaceDeclarationMetaModel classOrInterfaceDeclarationMetaModel = - new ClassOrInterfaceDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); + public static final ClassOrInterfaceDeclarationMetaModel classOrInterfaceDeclarationMetaModel = new ClassOrInterfaceDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ConstructorDeclarationMetaModel constructorDeclarationMetaModel = - new ConstructorDeclarationMetaModel(Optional.of(callableDeclarationMetaModel)); + public static final ConstructorDeclarationMetaModel constructorDeclarationMetaModel = new ConstructorDeclarationMetaModel(Optional.of(callableDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final EnumConstantDeclarationMetaModel enumConstantDeclarationMetaModel = - new EnumConstantDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final EnumConstantDeclarationMetaModel enumConstantDeclarationMetaModel = new EnumConstantDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final EnumDeclarationMetaModel enumDeclarationMetaModel = - new EnumDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); + public static final EnumDeclarationMetaModel enumDeclarationMetaModel = new EnumDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final FieldDeclarationMetaModel fieldDeclarationMetaModel = - new FieldDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final FieldDeclarationMetaModel fieldDeclarationMetaModel = new FieldDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final InitializerDeclarationMetaModel initializerDeclarationMetaModel = - new InitializerDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final InitializerDeclarationMetaModel initializerDeclarationMetaModel = new InitializerDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final MethodDeclarationMetaModel methodDeclarationMetaModel = - new MethodDeclarationMetaModel(Optional.of(callableDeclarationMetaModel)); + public static final MethodDeclarationMetaModel methodDeclarationMetaModel = new MethodDeclarationMetaModel(Optional.of(callableDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ParameterMetaModel parameterMetaModel = new ParameterMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ReceiverParameterMetaModel receiverParameterMetaModel = - new ReceiverParameterMetaModel(Optional.of(nodeMetaModel)); + public static final ReceiverParameterMetaModel receiverParameterMetaModel = new ReceiverParameterMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final RecordDeclarationMetaModel recordDeclarationMetaModel = - new RecordDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); + public static final RecordDeclarationMetaModel recordDeclarationMetaModel = new RecordDeclarationMetaModel(Optional.of(typeDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final CompactConstructorDeclarationMetaModel compactConstructorDeclarationMetaModel = - new CompactConstructorDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final CompactConstructorDeclarationMetaModel compactConstructorDeclarationMetaModel = new CompactConstructorDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final VariableDeclaratorMetaModel variableDeclaratorMetaModel = - new VariableDeclaratorMetaModel(Optional.of(nodeMetaModel)); + public static final VariableDeclaratorMetaModel variableDeclaratorMetaModel = new VariableDeclaratorMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final CommentMetaModel commentMetaModel = new CommentMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final BlockCommentMetaModel blockCommentMetaModel = - new BlockCommentMetaModel(Optional.of(commentMetaModel)); + public static final BlockCommentMetaModel blockCommentMetaModel = new BlockCommentMetaModel(Optional.of(commentMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final JavadocCommentMetaModel javadocCommentMetaModel = - new JavadocCommentMetaModel(Optional.of(commentMetaModel)); + public static final JavadocCommentMetaModel javadocCommentMetaModel = new JavadocCommentMetaModel(Optional.of(commentMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LineCommentMetaModel lineCommentMetaModel = - new LineCommentMetaModel(Optional.of(commentMetaModel)); + public static final LineCommentMetaModel lineCommentMetaModel = new LineCommentMetaModel(Optional.of(commentMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ArrayAccessExprMetaModel arrayAccessExprMetaModel = - new ArrayAccessExprMetaModel(Optional.of(expressionMetaModel)); + public static final ArrayAccessExprMetaModel arrayAccessExprMetaModel = new ArrayAccessExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ArrayCreationExprMetaModel arrayCreationExprMetaModel = - new ArrayCreationExprMetaModel(Optional.of(expressionMetaModel)); + public static final ArrayCreationExprMetaModel arrayCreationExprMetaModel = new ArrayCreationExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ArrayInitializerExprMetaModel arrayInitializerExprMetaModel = - new ArrayInitializerExprMetaModel(Optional.of(expressionMetaModel)); + public static final ArrayInitializerExprMetaModel arrayInitializerExprMetaModel = new ArrayInitializerExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final AssignExprMetaModel assignExprMetaModel = - new AssignExprMetaModel(Optional.of(expressionMetaModel)); + public static final AssignExprMetaModel assignExprMetaModel = new AssignExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final BinaryExprMetaModel binaryExprMetaModel = - new BinaryExprMetaModel(Optional.of(expressionMetaModel)); + public static final BinaryExprMetaModel binaryExprMetaModel = new BinaryExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final BooleanLiteralExprMetaModel booleanLiteralExprMetaModel = - new BooleanLiteralExprMetaModel(Optional.of(literalExprMetaModel)); + public static final BooleanLiteralExprMetaModel booleanLiteralExprMetaModel = new BooleanLiteralExprMetaModel(Optional.of(literalExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final CastExprMetaModel castExprMetaModel = new CastExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final CharLiteralExprMetaModel charLiteralExprMetaModel = - new CharLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final CharLiteralExprMetaModel charLiteralExprMetaModel = new CharLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ClassExprMetaModel classExprMetaModel = - new ClassExprMetaModel(Optional.of(expressionMetaModel)); + public static final ClassExprMetaModel classExprMetaModel = new ClassExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ConditionalExprMetaModel conditionalExprMetaModel = - new ConditionalExprMetaModel(Optional.of(expressionMetaModel)); + public static final ConditionalExprMetaModel conditionalExprMetaModel = new ConditionalExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel = - new DoubleLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel = new DoubleLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final EnclosedExprMetaModel enclosedExprMetaModel = - new EnclosedExprMetaModel(Optional.of(expressionMetaModel)); + public static final EnclosedExprMetaModel enclosedExprMetaModel = new EnclosedExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final FieldAccessExprMetaModel fieldAccessExprMetaModel = - new FieldAccessExprMetaModel(Optional.of(expressionMetaModel)); + public static final FieldAccessExprMetaModel fieldAccessExprMetaModel = new FieldAccessExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final InstanceOfExprMetaModel instanceOfExprMetaModel = - new InstanceOfExprMetaModel(Optional.of(expressionMetaModel)); + public static final InstanceOfExprMetaModel instanceOfExprMetaModel = new InstanceOfExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel = - new IntegerLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel = new IntegerLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LambdaExprMetaModel lambdaExprMetaModel = - new LambdaExprMetaModel(Optional.of(expressionMetaModel)); + public static final LambdaExprMetaModel lambdaExprMetaModel = new LambdaExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LongLiteralExprMetaModel longLiteralExprMetaModel = - new LongLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final LongLiteralExprMetaModel longLiteralExprMetaModel = new LongLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final MarkerAnnotationExprMetaModel markerAnnotationExprMetaModel = - new MarkerAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); + public static final MarkerAnnotationExprMetaModel markerAnnotationExprMetaModel = new MarkerAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final MemberValuePairMetaModel memberValuePairMetaModel = - new MemberValuePairMetaModel(Optional.of(nodeMetaModel)); + public static final MemberValuePairMetaModel memberValuePairMetaModel = new MemberValuePairMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final MethodCallExprMetaModel methodCallExprMetaModel = - new MethodCallExprMetaModel(Optional.of(expressionMetaModel)); + public static final MethodCallExprMetaModel methodCallExprMetaModel = new MethodCallExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final MethodReferenceExprMetaModel methodReferenceExprMetaModel = - new MethodReferenceExprMetaModel(Optional.of(expressionMetaModel)); + public static final MethodReferenceExprMetaModel methodReferenceExprMetaModel = new MethodReferenceExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final NameExprMetaModel nameExprMetaModel = new NameExprMetaModel(Optional.of(expressionMetaModel)); @@ -3193,43 +1361,34 @@ public static Optional getNodeMetaModel(Class c) { public static final NameMetaModel nameMetaModel = new NameMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final NormalAnnotationExprMetaModel normalAnnotationExprMetaModel = - new NormalAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); + public static final NormalAnnotationExprMetaModel normalAnnotationExprMetaModel = new NormalAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final NullLiteralExprMetaModel nullLiteralExprMetaModel = - new NullLiteralExprMetaModel(Optional.of(literalExprMetaModel)); + public static final NullLiteralExprMetaModel nullLiteralExprMetaModel = new NullLiteralExprMetaModel(Optional.of(literalExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ObjectCreationExprMetaModel objectCreationExprMetaModel = - new ObjectCreationExprMetaModel(Optional.of(expressionMetaModel)); + public static final ObjectCreationExprMetaModel objectCreationExprMetaModel = new ObjectCreationExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final PatternExprMetaModel patternExprMetaModel = - new PatternExprMetaModel(Optional.of(expressionMetaModel)); + public static final PatternExprMetaModel patternExprMetaModel = new PatternExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final RecordPatternExprMetaModel recordPatternExprMetaModel = - new RecordPatternExprMetaModel(Optional.of(patternExprMetaModel)); + public static final RecordPatternExprMetaModel recordPatternExprMetaModel = new RecordPatternExprMetaModel(Optional.of(patternExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SingleMemberAnnotationExprMetaModel singleMemberAnnotationExprMetaModel = - new SingleMemberAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); + public static final SingleMemberAnnotationExprMetaModel singleMemberAnnotationExprMetaModel = new SingleMemberAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final SimpleNameMetaModel simpleNameMetaModel = new SimpleNameMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SuperExprMetaModel superExprMetaModel = - new SuperExprMetaModel(Optional.of(expressionMetaModel)); + public static final SuperExprMetaModel superExprMetaModel = new SuperExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SwitchExprMetaModel switchExprMetaModel = - new SwitchExprMetaModel(Optional.of(expressionMetaModel)); + public static final SwitchExprMetaModel switchExprMetaModel = new SwitchExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final TextBlockLiteralExprMetaModel textBlockLiteralExprMetaModel = - new TextBlockLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); + public static final TextBlockLiteralExprMetaModel textBlockLiteralExprMetaModel = new TextBlockLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ThisExprMetaModel thisExprMetaModel = new ThisExprMetaModel(Optional.of(expressionMetaModel)); @@ -3238,20 +1397,49 @@ public static Optional getNodeMetaModel(Class c) { public static final TypeExprMetaModel typeExprMetaModel = new TypeExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final TypePatternExprMetaModel typePatternExprMetaModel = - new TypePatternExprMetaModel(Optional.of(patternExprMetaModel)); + public static final TypePatternExprMetaModel typePatternExprMetaModel = new TypePatternExprMetaModel(Optional.of(patternExprMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final UnaryExprMetaModel unaryExprMetaModel = new UnaryExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final VariableDeclarationExprMetaModel variableDeclarationExprMetaModel = new VariableDeclarationExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlDocMetaModel jmlDocMetaModel = new JmlDocMetaModel(Optional.of(nodeMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlDocDeclarationMetaModel jmlDocDeclarationMetaModel = new JmlDocDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlDocStmtMetaModel jmlDocStmtMetaModel = new JmlDocStmtMetaModel(Optional.of(statementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlDocTypeMetaModel jmlDocTypeMetaModel = new JmlDocTypeMetaModel(Optional.of(typeDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlQuantifiedExprMetaModel jmlQuantifiedExprMetaModel = new JmlQuantifiedExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlTypeExprMetaModel jmlTypeExprMetaModel = new JmlTypeExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlBinaryInfixExprMetaModel jmlBinaryInfixExprMetaModel = new JmlBinaryInfixExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final UnaryExprMetaModel unaryExprMetaModel = - new UnaryExprMetaModel(Optional.of(expressionMetaModel)); + public static final JmlLetExprMetaModel jmlLetExprMetaModel = new JmlLetExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final VariableDeclarationExprMetaModel variableDeclarationExprMetaModel = - new VariableDeclarationExprMetaModel(Optional.of(expressionMetaModel)); + public static final JmlMultiCompareExprMetaModel jmlMultiCompareExprMetaModel = new JmlMultiCompareExprMetaModel(Optional.of(expressionMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final AssertStmtMetaModel assertStmtMetaModel = - new AssertStmtMetaModel(Optional.of(statementMetaModel)); + public static final JmlLabelExprMetaModel jmlLabelExprMetaModel = new JmlLabelExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlSetComprehensionExprMetaModel jmlSetComprehensionExprMetaModel = new JmlSetComprehensionExprMetaModel(Optional.of(expressionMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final AssertStmtMetaModel assertStmtMetaModel = new AssertStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final BlockStmtMetaModel blockStmtMetaModel = new BlockStmtMetaModel(Optional.of(statementMetaModel)); @@ -3260,12 +1448,10 @@ public static Optional getNodeMetaModel(Class c) { public static final BreakStmtMetaModel breakStmtMetaModel = new BreakStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final CatchClauseMetaModel catchClauseMetaModel = - new CatchClauseMetaModel(Optional.of(nodeMetaModel)); + public static final CatchClauseMetaModel catchClauseMetaModel = new CatchClauseMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ContinueStmtMetaModel continueStmtMetaModel = - new ContinueStmtMetaModel(Optional.of(statementMetaModel)); + public static final ContinueStmtMetaModel continueStmtMetaModel = new ContinueStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final DoStmtMetaModel doStmtMetaModel = new DoStmtMetaModel(Optional.of(statementMetaModel)); @@ -3274,16 +1460,13 @@ public static Optional getNodeMetaModel(Class c) { public static final EmptyStmtMetaModel emptyStmtMetaModel = new EmptyStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ExplicitConstructorInvocationStmtMetaModel explicitConstructorInvocationStmtMetaModel = - new ExplicitConstructorInvocationStmtMetaModel(Optional.of(statementMetaModel)); + public static final ExplicitConstructorInvocationStmtMetaModel explicitConstructorInvocationStmtMetaModel = new ExplicitConstructorInvocationStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ExpressionStmtMetaModel expressionStmtMetaModel = - new ExpressionStmtMetaModel(Optional.of(statementMetaModel)); + public static final ExpressionStmtMetaModel expressionStmtMetaModel = new ExpressionStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ForEachStmtMetaModel forEachStmtMetaModel = - new ForEachStmtMetaModel(Optional.of(statementMetaModel)); + public static final ForEachStmtMetaModel forEachStmtMetaModel = new ForEachStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ForStmtMetaModel forStmtMetaModel = new ForStmtMetaModel(Optional.of(statementMetaModel)); @@ -3292,32 +1475,25 @@ public static Optional getNodeMetaModel(Class c) { public static final IfStmtMetaModel ifStmtMetaModel = new IfStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LabeledStmtMetaModel labeledStmtMetaModel = - new LabeledStmtMetaModel(Optional.of(statementMetaModel)); + public static final LabeledStmtMetaModel labeledStmtMetaModel = new LabeledStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LocalClassDeclarationStmtMetaModel localClassDeclarationStmtMetaModel = - new LocalClassDeclarationStmtMetaModel(Optional.of(statementMetaModel)); + public static final LocalClassDeclarationStmtMetaModel localClassDeclarationStmtMetaModel = new LocalClassDeclarationStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final LocalRecordDeclarationStmtMetaModel localRecordDeclarationStmtMetaModel = - new LocalRecordDeclarationStmtMetaModel(Optional.of(statementMetaModel)); + public static final LocalRecordDeclarationStmtMetaModel localRecordDeclarationStmtMetaModel = new LocalRecordDeclarationStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ReturnStmtMetaModel returnStmtMetaModel = - new ReturnStmtMetaModel(Optional.of(statementMetaModel)); + public static final ReturnStmtMetaModel returnStmtMetaModel = new ReturnStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SwitchEntryMetaModel switchEntryMetaModel = - new SwitchEntryMetaModel(Optional.of(nodeMetaModel)); + public static final SwitchEntryMetaModel switchEntryMetaModel = new SwitchEntryMetaModel(Optional.of(nodeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SwitchStmtMetaModel switchStmtMetaModel = - new SwitchStmtMetaModel(Optional.of(statementMetaModel)); + public static final SwitchStmtMetaModel switchStmtMetaModel = new SwitchStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final SynchronizedStmtMetaModel synchronizedStmtMetaModel = - new SynchronizedStmtMetaModel(Optional.of(statementMetaModel)); + public static final SynchronizedStmtMetaModel synchronizedStmtMetaModel = new SynchronizedStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final ThrowStmtMetaModel throwStmtMetaModel = new ThrowStmtMetaModel(Optional.of(statementMetaModel)); @@ -3326,8 +1502,7 @@ public static Optional getNodeMetaModel(Class c) { public static final TryStmtMetaModel tryStmtMetaModel = new TryStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final UnparsableStmtMetaModel unparsableStmtMetaModel = - new UnparsableStmtMetaModel(Optional.of(statementMetaModel)); + public static final UnparsableStmtMetaModel unparsableStmtMetaModel = new UnparsableStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final WhileStmtMetaModel whileStmtMetaModel = new WhileStmtMetaModel(Optional.of(statementMetaModel)); @@ -3336,31 +1511,103 @@ public static Optional getNodeMetaModel(Class c) { public static final YieldStmtMetaModel yieldStmtMetaModel = new YieldStmtMetaModel(Optional.of(statementMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ArrayTypeMetaModel arrayTypeMetaModel = - new ArrayTypeMetaModel(Optional.of(referenceTypeMetaModel)); + public static final JmlStatementMetaModel jmlStatementMetaModel = new JmlStatementMetaModel(Optional.of(statementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlGhostStmtMetaModel jmlGhostStmtMetaModel = new JmlGhostStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlExpressionStmtMetaModel jmlExpressionStmtMetaModel = new JmlExpressionStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlRefiningStmtMetaModel jmlRefiningStmtMetaModel = new JmlRefiningStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlUnreachableStmtMetaModel jmlUnreachableStmtMetaModel = new JmlUnreachableStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlLabelStmtMetaModel jmlLabelStmtMetaModel = new JmlLabelStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlBeginStmtMetaModel jmlBeginStmtMetaModel = new JmlBeginStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlEndStmtMetaModel jmlEndStmtMetaModel = new JmlEndStmtMetaModel(Optional.of(jmlStatementMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClassLevelDeclarationMetaModel jmlClassLevelDeclarationMetaModel = new JmlClassLevelDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlMethodDeclarationMetaModel jmlMethodDeclarationMetaModel = new JmlMethodDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlFieldDeclarationMetaModel jmlFieldDeclarationMetaModel = new JmlFieldDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClauseMetaModel jmlClauseMetaModel = new JmlClauseMetaModel(Optional.of(nodeMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlSimpleExprClauseMetaModel jmlSimpleExprClauseMetaModel = new JmlSimpleExprClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlMultiExprClauseMetaModel jmlMultiExprClauseMetaModel = new JmlMultiExprClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlSignalsClauseMetaModel jmlSignalsClauseMetaModel = new JmlSignalsClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlSignalsOnlyClauseMetaModel jmlSignalsOnlyClauseMetaModel = new JmlSignalsOnlyClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClauseLabelMetaModel jmlClauseLabelMetaModel = new JmlClauseLabelMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlForallClauseMetaModel jmlForallClauseMetaModel = new JmlForallClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlOldClauseMetaModel jmlOldClauseMetaModel = new JmlOldClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlCallableClauseMetaModel jmlCallableClauseMetaModel = new JmlCallableClauseMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClauseIfMetaModel jmlClauseIfMetaModel = new JmlClauseIfMetaModel(Optional.of(jmlClauseMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlMethodSignatureMetaModel jmlMethodSignatureMetaModel = new JmlMethodSignatureMetaModel(Optional.of(nodeMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlContractMetaModel jmlContractMetaModel = new JmlContractMetaModel(Optional.of(nodeMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClassExprDeclarationMetaModel jmlClassExprDeclarationMetaModel = new JmlClassExprDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlRepresentsDeclarationMetaModel jmlRepresentsDeclarationMetaModel = new JmlRepresentsDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final JmlClassAccessibleDeclarationMetaModel jmlClassAccessibleDeclarationMetaModel = new JmlClassAccessibleDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel)); + + @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") + public static final ArrayTypeMetaModel arrayTypeMetaModel = new ArrayTypeMetaModel(Optional.of(referenceTypeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ClassOrInterfaceTypeMetaModel classOrInterfaceTypeMetaModel = - new ClassOrInterfaceTypeMetaModel(Optional.of(referenceTypeMetaModel)); + public static final ClassOrInterfaceTypeMetaModel classOrInterfaceTypeMetaModel = new ClassOrInterfaceTypeMetaModel(Optional.of(referenceTypeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final IntersectionTypeMetaModel intersectionTypeMetaModel = - new IntersectionTypeMetaModel(Optional.of(typeMetaModel)); + public static final IntersectionTypeMetaModel intersectionTypeMetaModel = new IntersectionTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final PrimitiveTypeMetaModel primitiveTypeMetaModel = - new PrimitiveTypeMetaModel(Optional.of(typeMetaModel)); + public static final PrimitiveTypeMetaModel primitiveTypeMetaModel = new PrimitiveTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final TypeParameterMetaModel typeParameterMetaModel = - new TypeParameterMetaModel(Optional.of(referenceTypeMetaModel)); + public static final TypeParameterMetaModel typeParameterMetaModel = new TypeParameterMetaModel(Optional.of(referenceTypeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final UnionTypeMetaModel unionTypeMetaModel = new UnionTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final UnknownTypeMetaModel unknownTypeMetaModel = - new UnknownTypeMetaModel(Optional.of(typeMetaModel)); + public static final UnknownTypeMetaModel unknownTypeMetaModel = new UnknownTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") public static final VarTypeMetaModel varTypeMetaModel = new VarTypeMetaModel(Optional.of(typeMetaModel)); @@ -3369,28 +1616,22 @@ public static Optional getNodeMetaModel(Class c) { public static final VoidTypeMetaModel voidTypeMetaModel = new VoidTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final WildcardTypeMetaModel wildcardTypeMetaModel = - new WildcardTypeMetaModel(Optional.of(typeMetaModel)); + public static final WildcardTypeMetaModel wildcardTypeMetaModel = new WildcardTypeMetaModel(Optional.of(typeMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleExportsDirectiveMetaModel moduleExportsDirectiveMetaModel = - new ModuleExportsDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); + public static final ModuleExportsDirectiveMetaModel moduleExportsDirectiveMetaModel = new ModuleExportsDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleOpensDirectiveMetaModel moduleOpensDirectiveMetaModel = - new ModuleOpensDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); + public static final ModuleOpensDirectiveMetaModel moduleOpensDirectiveMetaModel = new ModuleOpensDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleProvidesDirectiveMetaModel moduleProvidesDirectiveMetaModel = - new ModuleProvidesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); + public static final ModuleProvidesDirectiveMetaModel moduleProvidesDirectiveMetaModel = new ModuleProvidesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleRequiresDirectiveMetaModel moduleRequiresDirectiveMetaModel = - new ModuleRequiresDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); + public static final ModuleRequiresDirectiveMetaModel moduleRequiresDirectiveMetaModel = new ModuleRequiresDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - public static final ModuleUsesDirectiveMetaModel moduleUsesDirectiveMetaModel = - new ModuleUsesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); + public static final ModuleUsesDirectiveMetaModel moduleUsesDirectiveMetaModel = new ModuleUsesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel)); static { initializeNodeMetaModels(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java index 903fc99919..da5560bcc0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.comments.JavadocComment; import java.util.Optional; +import com.github.javaparser.ast.comments.JavadocComment; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JavadocCommentMetaModel extends CommentMetaModel { +public class JavadocCommentMetaModel extends CommentMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JavadocCommentMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - JavadocComment.class, - "JavadocComment", - "com.github.javaparser.ast.comments", - false, - false); + super(superBaseNodeMetaModel, JavadocComment.class, "JavadocComment", "com.github.javaparser.ast.comments", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java index 63103b6936..fc3d033c8c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlAssertStmtMetaModel extends JmlStatementMetaModel { +public class JmlAssertStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlAssertStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlAssertStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java index 9f69caf338..7c4e9fdb4f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlBeginStmtMetaModel extends JmlStatementMetaModel { +public class JmlBeginStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlBeginStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlBeginStmt.class, "JmlBeginStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java index c6940fa0a4..06d9a75346 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlBinaryInfixExprMetaModel extends ExpressionMetaModel { +public class JmlBinaryInfixExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlBinaryInfixExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlBinaryInfixExpr.class, "JmlBinaryInfixExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel leftPropertyMetaModel; + public PropertyMetaModel leftPropertyMetaModel; - public PropertyMetaModel operatorPropertyMetaModel; + public PropertyMetaModel operatorPropertyMetaModel; - public PropertyMetaModel rightPropertyMetaModel; + public PropertyMetaModel rightPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java index afb24d1a91..0ad2fd1551 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlBindingExprMetaModel extends ExpressionMetaModel { +public class JmlBindingExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlBindingExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlQuantifiedExpr.class, "JmlBindingExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel binderPropertyMetaModel; + public PropertyMetaModel binderPropertyMetaModel; - public PropertyMetaModel expressionsPropertyMetaModel; + public PropertyMetaModel expressionsPropertyMetaModel; - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java index ac43883409..0fe3b0647e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlCallableClauseMetaModel extends JmlClauseMetaModel { +public class JmlCallableClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlCallableClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlCallableClause.class, "JmlCallableClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel methodSignaturesPropertyMetaModel; + public PropertyMetaModel methodSignaturesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java index a12f80b7b5..3bce6d5d0c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java @@ -34,20 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClassAccessibleDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { +public class JmlClassAccessibleDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClassAccessibleDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClassAccessibleDeclaration.class, "JmlClassAccessibleDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel expressionsPropertyMetaModel; + public PropertyMetaModel expressionsPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel measuredByPropertyMetaModel; + public PropertyMetaModel measuredByPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel variablePropertyMetaModel; + public PropertyMetaModel variablePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java index 5eb5fe089a..9500382a7e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java @@ -34,20 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClassExprDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { +public class JmlClassExprDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClassExprDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClassExprDeclaration.class, "JmlClassExprDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel invariantPropertyMetaModel; + public PropertyMetaModel invariantPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java index 6dce997976..2dbd72fa6d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClassInvariantDeclarationMetaModel extends JmlClassLevelMetaModel { +public class JmlClassInvariantDeclarationMetaModel extends JmlClassLevelMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClassInvariantDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClassExprDeclaration.class, "JmlClassInvariantDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel invariantPropertyMetaModel; + public PropertyMetaModel invariantPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java index 7caadd0807..9e606f767b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java @@ -21,7 +21,6 @@ package com.github.javaparser.metamodel; import java.util.Optional; - import com.github.javaparser.ast.jml.body.JmlClassLevelDeclaration; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; @@ -36,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClassLevelDeclarationMetaModel extends BodyDeclarationMetaModel { +public class JmlClassLevelDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClassLevelDeclarationMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java index 06a13c22a7..7846ef227a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClassLevelMetaModel extends BodyDeclarationMetaModel { +public class JmlClassLevelMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClassLevelMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java index 1ba0bf89f2..4d929b889a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClauseIfMetaModel extends JmlClauseMetaModel { +public class JmlClauseIfMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClauseIfMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClauseIf.class, "JmlClauseIf", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel conditionPropertyMetaModel; + public PropertyMetaModel conditionPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; - public PropertyMetaModel thenPropertyMetaModel; + public PropertyMetaModel thenPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java index 3dc7b52045..a3828da64f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClauseLEMetaModel extends JmlClauseMetaModel { +public class JmlClauseLEMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClauseLEMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClauseLabel.class, "JmlClauseLE", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel exprPropertyMetaModel; + public PropertyMetaModel exprPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java index fb844d2c80..d01e273805 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClauseLabelMetaModel extends JmlClauseMetaModel { +public class JmlClauseLabelMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClauseLabelMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlClauseLabel.class, "JmlClauseLabel", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel exprPropertyMetaModel; + public PropertyMetaModel exprPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java index d2f5556aae..b5f8ed92a8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlClauseMetaModel extends NodeMetaModel { +public class JmlClauseMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlClauseMetaModel(Optional superBaseNodeMetaModel) { @@ -47,5 +47,5 @@ protected JmlClauseMetaModel(Optional superNodeMetaModel, Cla super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java index 993efe6cc2..7150efbd45 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java @@ -34,24 +34,24 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlContractMetaModel extends NodeMetaModel { +public class JmlContractMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlContractMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlContract.class, "JmlContract", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel behaviorPropertyMetaModel; + public PropertyMetaModel behaviorPropertyMetaModel; - public PropertyMetaModel clausesPropertyMetaModel; + public PropertyMetaModel clausesPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel subContractsPropertyMetaModel; + public PropertyMetaModel subContractsPropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java index d1d1d00d16..ff1e1d1775 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDefaultClauseMetaModel extends JmlClauseMetaModel { +public class JmlDefaultClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDefaultClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSimpleExprClause.class, "JmlDefaultClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel heapsPropertyMetaModel; + public PropertyMetaModel heapsPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java index ac72a8263f..4f69e4a4bc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDocDeclarationMetaModel extends BodyDeclarationMetaModel { +public class JmlDocDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDocDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlDocDeclaration.class, "JmlDocDeclaration", "com.github.javaparser.ast.jml.doc", false, false); } - public PropertyMetaModel jmlCommentsPropertyMetaModel; + public PropertyMetaModel jmlCommentsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java index d8f4d6cc81..97cc4a4f35 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDocMetaModel extends NodeMetaModel { +public class JmlDocMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDocMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlDoc.class, "JmlDoc", "com.github.javaparser.ast.jml.doc", false, false); } - public PropertyMetaModel contentPropertyMetaModel; + public PropertyMetaModel contentPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocModifierMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocModifierMetaModel.java index 368c1750d1..c8d5e5ce2b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocModifierMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocModifierMetaModel.java @@ -33,12 +33,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDocModifierMetaModel extends ModifierMetaModel { +public class JmlDocModifierMetaModel extends ModifierMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDocModifierMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel); } - public PropertyMetaModel jmlCommentsPropertyMetaModel; + public PropertyMetaModel jmlCommentsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java index 6ddb15962d..5132aa3cfc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDocStmtMetaModel extends StatementMetaModel { +public class JmlDocStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDocStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlDocStmt.class, "JmlDocStmt", "com.github.javaparser.ast.jml.doc", false, false); } - public PropertyMetaModel jmlCommentsPropertyMetaModel; + public PropertyMetaModel jmlCommentsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java index 61dd17fce7..715d903ca0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlDocTypeMetaModel extends TypeDeclarationMetaModel { +public class JmlDocTypeMetaModel extends TypeDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlDocTypeMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlDocType.class, "JmlDocType", "com.github.javaparser.ast.jml.doc", false, false); } - public PropertyMetaModel jmlCommentsPropertyMetaModel; + public PropertyMetaModel jmlCommentsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java index 23a01b3c2a..f37b14d316 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlEndStmtMetaModel extends JmlStatementMetaModel { +public class JmlEndStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlEndStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlEndStmt.class, "JmlEndStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java index 31755e5e40..5f212a2247 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlExpressionStmtMetaModel extends JmlStatementMetaModel { +public class JmlExpressionStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlExpressionStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlExpressionStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java index 1eb5c5eb70..1e5a40d32d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlFieldDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { +public class JmlFieldDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlFieldDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlFieldDeclaration.class, "JmlFieldDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel declPropertyMetaModel; + public PropertyMetaModel declPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java index 78dd442f6c..9f55cbc60b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlForallClauseMetaModel extends JmlClauseMetaModel { +public class JmlForallClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlForallClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlForallClause.class, "JmlForallClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel boundedVariablesPropertyMetaModel; + public PropertyMetaModel boundedVariablesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java index 0abb6b4b13..2f0e6b2a3c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlGhostStatementMetaModel extends JmlStatementMetaModel { +public class JmlGhostStatementMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlGhostStatementMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStatement", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel statementPropertyMetaModel; + public PropertyMetaModel statementPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java index c1d1e5b8d0..8095219dda 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlGhostStatementsMetaModel extends JmlStatementMetaModel { +public class JmlGhostStatementsMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlGhostStatementsMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStatements", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel statementsPropertyMetaModel; + public PropertyMetaModel statementsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java index aa8ca5972e..89daa835de 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlGhostStmtMetaModel extends JmlStatementMetaModel { +public class JmlGhostStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlGhostStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel statementPropertyMetaModel; + public PropertyMetaModel statementPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java index 7ee44c1612..b16edb91f7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlLabelExprMetaModel extends ExpressionMetaModel { +public class JmlLabelExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlLabelExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlLabelExpr.class, "JmlLabelExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java index bc8b23215a..8631dcb916 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlLabelMetaModel extends ExpressionMetaModel { +public class JmlLabelMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlLabelMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlLabelExpr.class, "JmlLabel", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java index 4445a4ea6b..c530607f20 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlLabelStmtMetaModel extends JmlStatementMetaModel { +public class JmlLabelStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlLabelStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlLabelStmt.class, "JmlLabelStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java index b8645d357c..5c93a03afc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlLetExprMetaModel extends ExpressionMetaModel { +public class JmlLetExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlLetExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlLetExpr.class, "JmlLetExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java index c3c89402b7..01f4abfe64 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlMethodDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { +public class JmlMethodDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlMethodDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlMethodDeclaration.class, "JmlMethodDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel contractPropertyMetaModel; + public PropertyMetaModel contractPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel methodDeclarationPropertyMetaModel; + public PropertyMetaModel methodDeclarationPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java index 586a439ead..ba2a9bc3cb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlMethodSignatureMetaModel extends NodeMetaModel { +public class JmlMethodSignatureMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlMethodSignatureMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlMethodSignature.class, "JmlMethodSignature", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel argumentTypesPropertyMetaModel; + public PropertyMetaModel argumentTypesPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel receiverPropertyMetaModel; + public PropertyMetaModel receiverPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java index 3f465da67e..5ac73e8923 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlMultiCompareExprMetaModel extends ExpressionMetaModel { +public class JmlMultiCompareExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlMultiCompareExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlMultiCompareExpr.class, "JmlMultiCompareExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel expressionsPropertyMetaModel; + public PropertyMetaModel expressionsPropertyMetaModel; - public PropertyMetaModel operatorsPropertyMetaModel; + public PropertyMetaModel operatorsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java index 6435fb6bd6..18fe4f28a9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlMultiExprClauseMetaModel extends JmlClauseMetaModel { +public class JmlMultiExprClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlMultiExprClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlMultiExprClause.class, "JmlMultiExprClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel expressionsPropertyMetaModel; + public PropertyMetaModel expressionsPropertyMetaModel; - public PropertyMetaModel heapsPropertyMetaModel; + public PropertyMetaModel heapsPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java index 2bc5e8dafd..21db671701 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlOldClauseMetaModel extends JmlClauseMetaModel { +public class JmlOldClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlOldClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlOldClause.class, "JmlOldClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel declarationsPropertyMetaModel; + public PropertyMetaModel declarationsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java index fa6dde646c..eed845aba5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlQuantifiedExprMetaModel extends ExpressionMetaModel { +public class JmlQuantifiedExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlQuantifiedExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlQuantifiedExpr.class, "JmlQuantifiedExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel binderPropertyMetaModel; + public PropertyMetaModel binderPropertyMetaModel; - public PropertyMetaModel expressionsPropertyMetaModel; + public PropertyMetaModel expressionsPropertyMetaModel; - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java index cd59527579..d9b7e622ae 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlRefiningStmtMetaModel extends JmlStatementMetaModel { +public class JmlRefiningStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlRefiningStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlRefiningStmt.class, "JmlRefiningStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java index 7f98b45e67..67c8e91b69 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java @@ -34,18 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlRepresentsDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { +public class JmlRepresentsDeclarationMetaModel extends JmlClassLevelDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlRepresentsDeclarationMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlRepresentsDeclaration.class, "JmlRepresentsDeclaration", "com.github.javaparser.ast.jml.body", false, false); } - public PropertyMetaModel exprPropertyMetaModel; + public PropertyMetaModel exprPropertyMetaModel; - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java index 76d4d8a0ba..eb50ffd75f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java @@ -21,7 +21,6 @@ package com.github.javaparser.metamodel; import java.util.Optional; - import com.github.javaparser.ast.jml.expr.JmlSetComprehensionExpr; import com.github.javaparser.ast.Generated; @@ -35,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlSetComprehensionExprMetaModel extends ExpressionMetaModel { +public class JmlSetComprehensionExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlSetComprehensionExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSetComprehensionExpr.class, "JmlSetComprehensionExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel bindingPropertyMetaModel; + public PropertyMetaModel bindingPropertyMetaModel; - public PropertyMetaModel predicatePropertyMetaModel; + public PropertyMetaModel predicatePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java index 662500d981..14b8605ea6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlSetComprehensionMetaModel extends ExpressionMetaModel { +public class JmlSetComprehensionMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlSetComprehensionMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSetComprehensionExpr.class, "JmlSetComprehensionExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel bindingPropertyMetaModel; + public PropertyMetaModel bindingPropertyMetaModel; - public PropertyMetaModel predicatePropertyMetaModel; + public PropertyMetaModel predicatePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java index a6e47c8ec1..361c2fe7c5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlSignalsClauseMetaModel extends JmlClauseMetaModel { +public class JmlSignalsClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlSignalsClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSignalsClause.class, "JmlSignalsClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel parameterPropertyMetaModel; + public PropertyMetaModel parameterPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java index 8adf427978..6e992aad0b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlSignalsOnlyClauseMetaModel extends JmlClauseMetaModel { +public class JmlSignalsOnlyClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlSignalsOnlyClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSignalsOnlyClause.class, "JmlSignalsOnlyClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel typesPropertyMetaModel; + public PropertyMetaModel typesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java index 1edab8a92c..04a88c8ca4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlSimpleExprClauseMetaModel extends JmlClauseMetaModel { +public class JmlSimpleExprClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlSimpleExprClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSimpleExprClause.class, "JmlSimpleExprClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel heapsPropertyMetaModel; + public PropertyMetaModel heapsPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java index 8eb9628861..147a9c77c6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlStatementMetaModel extends StatementMetaModel { +public class JmlStatementMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlStatementMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java index 4765dbd7a7..d833cdfec1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlStmtWithExpressionMetaModel extends JmlStatementMetaModel { +public class JmlStmtWithExpressionMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlStmtWithExpressionMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlStmtWithExpression", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel kindPropertyMetaModel; + public PropertyMetaModel kindPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java index 260398ca75..0e6ce30440 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlTypeExprMetaModel extends ExpressionMetaModel { +public class JmlTypeExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlTypeExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlTypeExpr.class, "JmlTypeExpr", "com.github.javaparser.ast.jml.expr", false, false); } - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java index bf2703eee3..b5e7576d83 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class JmlUnreachableStmtMetaModel extends JmlStatementMetaModel { +public class JmlUnreachableStmtMetaModel extends JmlStatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") JmlUnreachableStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlUnreachableStmt.class, "JmlUnreachableStmt", "com.github.javaparser.ast.jml.stmt", false, false); } - public PropertyMetaModel jmlTagsPropertyMetaModel; + public PropertyMetaModel jmlTagsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java index 33bb26a718..b8e7c71859 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.LabeledStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.LabeledStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LabeledStmtMetaModel extends StatementMetaModel { +public class LabeledStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LabeledStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, LabeledStmt.class, "LabeledStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel labelPropertyMetaModel; + public PropertyMetaModel labelPropertyMetaModel; - public PropertyMetaModel statementPropertyMetaModel; + public PropertyMetaModel statementPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java index bf131fa130..cc5e7311ff 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.LambdaExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.LambdaExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LambdaExprMetaModel extends ExpressionMetaModel { +public class LambdaExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LambdaExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, LambdaExpr.class, "LambdaExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; + + public PropertyMetaModel contractsPropertyMetaModel; - public PropertyMetaModel isEnclosingParametersPropertyMetaModel; + public PropertyMetaModel isEnclosingParametersPropertyMetaModel; - public PropertyMetaModel parametersPropertyMetaModel; + public PropertyMetaModel parametersPropertyMetaModel; - public PropertyMetaModel expressionBodyPropertyMetaModel; + public PropertyMetaModel expressionBodyPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java index e5a960cef4..5786488fe1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.comments.LineComment; import java.util.Optional; +import com.github.javaparser.ast.comments.LineComment; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LineCommentMetaModel extends CommentMetaModel { +public class LineCommentMetaModel extends CommentMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LineCommentMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - LineComment.class, - "LineComment", - "com.github.javaparser.ast.comments", - false, - false); + super(superBaseNodeMetaModel, LineComment.class, "LineComment", "com.github.javaparser.ast.comments", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java index 6b849ba2d7..7bcb234f20 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.expr.LiteralExpr; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.expr.LiteralExpr; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LiteralExprMetaModel extends ExpressionMetaModel { +public class LiteralExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LiteralExprMetaModel(Optional superBaseNodeMetaModel) { @@ -43,13 +43,7 @@ public class LiteralExprMetaModel extends ExpressionMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected LiteralExprMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected LiteralExprMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java index 638bffe612..0000d87ad9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.expr.LiteralStringValueExpr; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.expr.LiteralStringValueExpr; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,29 +35,17 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LiteralStringValueExprMetaModel extends LiteralExprMetaModel { +public class LiteralStringValueExprMetaModel extends LiteralExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LiteralStringValueExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - LiteralStringValueExpr.class, - "LiteralStringValueExpr", - "com.github.javaparser.ast.expr", - true, - false); + super(superBaseNodeMetaModel, LiteralStringValueExpr.class, "LiteralStringValueExpr", "com.github.javaparser.ast.expr", true, false); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected LiteralStringValueExprMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected LiteralStringValueExprMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel valuePropertyMetaModel; + public PropertyMetaModel valuePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java index ecd093bf29..331d4a7f4e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LocalClassDeclarationStmtMetaModel extends StatementMetaModel { +public class LocalClassDeclarationStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LocalClassDeclarationStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - LocalClassDeclarationStmt.class, - "LocalClassDeclarationStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, LocalClassDeclarationStmt.class, "LocalClassDeclarationStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel classDeclarationPropertyMetaModel; + public PropertyMetaModel classDeclarationPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java index 69fed56455..6e568f29e9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.LocalRecordDeclarationStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.LocalRecordDeclarationStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LocalRecordDeclarationStmtMetaModel extends StatementMetaModel { +public class LocalRecordDeclarationStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LocalRecordDeclarationStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - LocalRecordDeclarationStmt.class, - "LocalRecordDeclarationStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, LocalRecordDeclarationStmt.class, "LocalRecordDeclarationStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel recordDeclarationPropertyMetaModel; + public PropertyMetaModel recordDeclarationPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java index 0768c58102..9372fee21e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.LongLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.LongLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class LongLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class LongLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") LongLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - LongLiteralExpr.class, - "LongLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, LongLiteralExpr.class, "LongLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java index 6b72a48c90..14573ef780 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.MarkerAnnotationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.MarkerAnnotationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class MarkerAnnotationExprMetaModel extends AnnotationExprMetaModel { +public class MarkerAnnotationExprMetaModel extends AnnotationExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") MarkerAnnotationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - MarkerAnnotationExpr.class, - "MarkerAnnotationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, MarkerAnnotationExpr.class, "MarkerAnnotationExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java index 1331e6d7c2..e97f66721b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.MemberValuePair; import java.util.Optional; +import com.github.javaparser.ast.expr.MemberValuePair; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class MemberValuePairMetaModel extends NodeMetaModel { +public class MemberValuePairMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") MemberValuePairMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - MemberValuePair.class, - "MemberValuePair", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, MemberValuePair.class, "MemberValuePair", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel valuePropertyMetaModel; + public PropertyMetaModel valuePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java index a04e83b9eb..8d32481792 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.MethodCallExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.MethodCallExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,26 +34,20 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class MethodCallExprMetaModel extends ExpressionMetaModel { +public class MethodCallExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") MethodCallExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - MethodCallExpr.class, - "MethodCallExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, MethodCallExpr.class, "MethodCallExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel argumentsPropertyMetaModel; + public PropertyMetaModel argumentsPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel scopePropertyMetaModel; + public PropertyMetaModel scopePropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java index 9b5f53beda..f36a6cb514 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.MethodDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.MethodDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class MethodDeclarationMetaModel extends CallableDeclarationMetaModel { +public class MethodDeclarationMetaModel extends CallableDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") MethodDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - MethodDeclaration.class, - "MethodDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, MethodDeclaration.class, "MethodDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java index b6b11a73a9..0b1a9df8a9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.MethodReferenceExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.MethodReferenceExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class MethodReferenceExprMetaModel extends ExpressionMetaModel { +public class MethodReferenceExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") MethodReferenceExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - MethodReferenceExpr.class, - "MethodReferenceExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, MethodReferenceExpr.class, "MethodReferenceExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel identifierPropertyMetaModel; + public PropertyMetaModel identifierPropertyMetaModel; - public PropertyMetaModel scopePropertyMetaModel; + public PropertyMetaModel scopePropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java index 6024db6ce3..13dfe0db74 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.Modifier; import java.util.Optional; +import com.github.javaparser.ast.Modifier; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModifierMetaModel extends NodeMetaModel { +public class ModifierMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModifierMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, Modifier.class, "Modifier", "com.github.javaparser.ast", false, false); } - public PropertyMetaModel keywordPropertyMetaModel; + public PropertyMetaModel keywordPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java index 804dc02cdd..e23a283c10 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleDeclaration; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleDeclarationMetaModel extends NodeMetaModel { +public class ModuleDeclarationMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleDeclaration.class, - "ModuleDeclaration", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleDeclaration.class, "ModuleDeclaration", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel directivesPropertyMetaModel; + public PropertyMetaModel directivesPropertyMetaModel; - public PropertyMetaModel isOpenPropertyMetaModel; + public PropertyMetaModel isOpenPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java index ac1c7e1c8f..63befdaead 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleDirective; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.modules.ModuleDirective; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,27 +35,15 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleDirectiveMetaModel extends NodeMetaModel { +public class ModuleDirectiveMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleDirective.class, - "ModuleDirective", - "com.github.javaparser.ast.modules", - true, - false); + super(superBaseNodeMetaModel, ModuleDirective.class, "ModuleDirective", "com.github.javaparser.ast.modules", true, false); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected ModuleDirectiveMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected ModuleDirectiveMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java index de2bea0fbc..b22de7d759 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleExportsDirective; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleExportsDirective; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleExportsDirectiveMetaModel extends ModuleDirectiveMetaModel { +public class ModuleExportsDirectiveMetaModel extends ModuleDirectiveMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleExportsDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleExportsDirective.class, - "ModuleExportsDirective", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleExportsDirective.class, "ModuleExportsDirective", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel moduleNamesPropertyMetaModel; + public PropertyMetaModel moduleNamesPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java index d6d6a3fdf9..220b12d0cb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleOpensDirective; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleOpensDirective; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleOpensDirectiveMetaModel extends ModuleDirectiveMetaModel { +public class ModuleOpensDirectiveMetaModel extends ModuleDirectiveMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleOpensDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleOpensDirective.class, - "ModuleOpensDirective", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleOpensDirective.class, "ModuleOpensDirective", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel moduleNamesPropertyMetaModel; + public PropertyMetaModel moduleNamesPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java index f0dc04ba53..58984de672 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleProvidesDirective; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleProvidesDirective; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleProvidesDirectiveMetaModel extends ModuleDirectiveMetaModel { +public class ModuleProvidesDirectiveMetaModel extends ModuleDirectiveMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleProvidesDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleProvidesDirective.class, - "ModuleProvidesDirective", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleProvidesDirective.class, "ModuleProvidesDirective", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel withPropertyMetaModel; + public PropertyMetaModel withPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java index 47444b227d..0571c75356 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleRequiresDirective; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleRequiresDirective; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleRequiresDirectiveMetaModel extends ModuleDirectiveMetaModel { +public class ModuleRequiresDirectiveMetaModel extends ModuleDirectiveMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleRequiresDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleRequiresDirective.class, - "ModuleRequiresDirective", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleRequiresDirective.class, "ModuleRequiresDirective", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java index e4109f4b16..0079ac6d04 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.modules.ModuleUsesDirective; import java.util.Optional; +import com.github.javaparser.ast.modules.ModuleUsesDirective; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ModuleUsesDirectiveMetaModel extends ModuleDirectiveMetaModel { +public class ModuleUsesDirectiveMetaModel extends ModuleDirectiveMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ModuleUsesDirectiveMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ModuleUsesDirective.class, - "ModuleUsesDirective", - "com.github.javaparser.ast.modules", - false, - false); + super(superBaseNodeMetaModel, ModuleUsesDirective.class, "ModuleUsesDirective", "com.github.javaparser.ast.modules", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java index 62f3045c53..84acb408d6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.NameExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.NameExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class NameExprMetaModel extends ExpressionMetaModel { +public class NameExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") NameExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, NameExpr.class, "NameExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java index fd4ed2eeac..e763f1f078 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.Name; import java.util.Optional; +import com.github.javaparser.ast.expr.Name; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class NameMetaModel extends NodeMetaModel { +public class NameMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") NameMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, Name.class, "Name", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel identifierPropertyMetaModel; + public PropertyMetaModel identifierPropertyMetaModel; - public PropertyMetaModel qualifierPropertyMetaModel; + public PropertyMetaModel qualifierPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java index 4e92d7cace..de12db5929 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.Node; import java.util.Optional; +import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class NodeMetaModel extends BaseNodeMetaModel { +public class NodeMetaModel extends BaseNodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") NodeMetaModel(Optional superBaseNodeMetaModel) { @@ -42,15 +42,9 @@ public class NodeMetaModel extends BaseNodeMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected NodeMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected NodeMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel commentPropertyMetaModel; + public PropertyMetaModel commentPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java index 6605ea9bcf..63a37cbc0d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java @@ -23,7 +23,6 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -33,5 +32,6 @@ * (Used during generation of the meta model.) */ @Retention(RUNTIME) -@Target({FIELD, METHOD}) -public @interface NonEmptyProperty {} +@Target({ FIELD, METHOD }) +public @interface NonEmptyProperty { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java index 3e086c7f7d..fe40f94fb4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.NormalAnnotationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.NormalAnnotationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class NormalAnnotationExprMetaModel extends AnnotationExprMetaModel { +public class NormalAnnotationExprMetaModel extends AnnotationExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") NormalAnnotationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - NormalAnnotationExpr.class, - "NormalAnnotationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, NormalAnnotationExpr.class, "NormalAnnotationExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel pairsPropertyMetaModel; + public PropertyMetaModel pairsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java index 19a25f8fb7..3704cff38e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.NullLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.NullLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class NullLiteralExprMetaModel extends LiteralExprMetaModel { +public class NullLiteralExprMetaModel extends LiteralExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") NullLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - NullLiteralExpr.class, - "NullLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, NullLiteralExpr.class, "NullLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java index b7f37471c6..46bcb9faf7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ObjectCreationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ObjectCreationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,28 +34,22 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ObjectCreationExprMetaModel extends ExpressionMetaModel { +public class ObjectCreationExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ObjectCreationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ObjectCreationExpr.class, - "ObjectCreationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, ObjectCreationExpr.class, "ObjectCreationExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel anonymousClassBodyPropertyMetaModel; + public PropertyMetaModel anonymousClassBodyPropertyMetaModel; - public PropertyMetaModel argumentsPropertyMetaModel; + public PropertyMetaModel argumentsPropertyMetaModel; - public PropertyMetaModel scopePropertyMetaModel; + public PropertyMetaModel scopePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; - public PropertyMetaModel typeArgumentsPropertyMetaModel; + public PropertyMetaModel typeArgumentsPropertyMetaModel; - public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; + public PropertyMetaModel usingDiamondOperatorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java index c746f2d3b8..53a1ce2f88 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java @@ -22,7 +22,6 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -32,4 +31,5 @@ */ @Retention(RUNTIME) @Target(FIELD) -public @interface OptionalProperty {} +public @interface OptionalProperty { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java index 010caf483a..70bcd20840 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.PackageDeclaration; import java.util.Optional; +import com.github.javaparser.ast.PackageDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class PackageDeclarationMetaModel extends NodeMetaModel { +public class PackageDeclarationMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") PackageDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - PackageDeclaration.class, - "PackageDeclaration", - "com.github.javaparser.ast", - false, - false); + super(superBaseNodeMetaModel, PackageDeclaration.class, "PackageDeclaration", "com.github.javaparser.ast", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java index 059a6cbffb..fda0713290 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.Parameter; import java.util.Optional; +import com.github.javaparser.ast.body.Parameter; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,22 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ParameterMetaModel extends NodeMetaModel { +public class ParameterMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ParameterMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, Parameter.class, "Parameter", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel isVarArgsPropertyMetaModel; + public PropertyMetaModel isVarArgsPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; - public PropertyMetaModel varArgsAnnotationsPropertyMetaModel; + public PropertyMetaModel varArgsAnnotationsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java index 6262b97a6a..9632774da3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.expr.PatternExpr; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.expr.PatternExpr; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class PatternExprMetaModel extends ExpressionMetaModel { +public class PatternExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") PatternExprMetaModel(Optional superBaseNodeMetaModel) { @@ -43,15 +43,9 @@ public class PatternExprMetaModel extends ExpressionMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected PatternExprMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected PatternExprMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java index 103ae7ff61..3e4936dfdd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.PrimitiveType; import java.util.Optional; +import com.github.javaparser.ast.type.PrimitiveType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class PrimitiveTypeMetaModel extends TypeMetaModel { +public class PrimitiveTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") PrimitiveTypeMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - PrimitiveType.class, - "PrimitiveType", - "com.github.javaparser.ast.type", - false, - false); + super(superBaseNodeMetaModel, PrimitiveType.class, "PrimitiveType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java index c9839b8d2a..1624c1a63d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java @@ -22,7 +22,6 @@ import static com.github.javaparser.utils.CodeGenerationUtils.getterName; import static com.github.javaparser.utils.CodeGenerationUtils.setterName; - import com.github.javaparser.ast.Node; import java.lang.reflect.Field; import java.util.Optional; @@ -30,7 +29,7 @@ /** * Meta-data about a property of a node in the AST. */ -public class PropertyMetaModel { +public class PropertyMetaModel { private final BaseNodeMetaModel containingNodeMetaModel; @@ -48,15 +47,7 @@ public class PropertyMetaModel { private final boolean hasWildcard; - public PropertyMetaModel( - BaseNodeMetaModel containingNodeMetaModel, - String name, - Class type, - Optional nodeReference, - boolean isOptional, - boolean isNonEmpty, - boolean isNodeList, - boolean hasWildcard) { + public PropertyMetaModel(BaseNodeMetaModel containingNodeMetaModel, String name, Class type, Optional nodeReference, boolean isOptional, boolean isNonEmpty, boolean isNodeList, boolean hasWildcard) { this.containingNodeMetaModel = containingNodeMetaModel; this.name = name; this.type = type; @@ -70,118 +61,122 @@ public PropertyMetaModel( /** * @return is this the field fieldName on class c? */ - public boolean is(Class c, String fieldName) { + public boolean is(Class c, String fieldName) { return containingNodeMetaModel.is(c) && name.equals(fieldName); } /** * @return is this fields called fieldName? */ - public boolean is(String fieldName) { + public boolean is(String fieldName) { return name.equals(fieldName); } /** * @return the name used in the AST for the setter */ - public String getSetterMethodName() { + public String getSetterMethodName() { return setterName(name); } /** * @return the name used in the AST for the getter */ - public String getGetterMethodName() { + public String getGetterMethodName() { return getterName(type, name); } /** * @return the NodeMetaModel that "has" this property. */ - public BaseNodeMetaModel getContainingNodeMetaModel() { + public BaseNodeMetaModel getContainingNodeMetaModel() { return containingNodeMetaModel; } /** * @return the name of the property. This is equal to the name of the field in the AST. */ - public String getName() { + public String getName() { return name; } /** * @return if this property is a String or a NodeList: whether it may be empty. */ - public boolean isNonEmpty() { + public boolean isNonEmpty() { return isNonEmpty; } /** * @return the class of the field. */ - public Class getType() { + public Class getType() { return type; } /** * @return if this property is a Node, this will get the node meta model. */ - public Optional getNodeReference() { + public Optional getNodeReference() { return nodeReference; } /** * @return whether this property is optional. */ - public boolean isOptional() { + public boolean isOptional() { return isOptional; } /** * @return whether this property is not optional. */ - public boolean isRequired() { + public boolean isRequired() { return !isOptional; } /** * @return whether this property is contained in a NodeList. */ - public boolean isNodeList() { + public boolean isNodeList() { return isNodeList; } /** * @return whether this property has a wildcard following it, like BodyDeclaration<?>. */ - public boolean hasWildcard() { + public boolean hasWildcard() { return hasWildcard; } /** * @return whether this property is not a list or set. */ - public boolean isSingular() { + public boolean isSingular() { return !isNodeList; } @Override - public String toString() { + public String toString() { return "(" + getTypeName() + ")\t" + containingNodeMetaModel + "#" + name; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; PropertyMetaModel that = (PropertyMetaModel) o; - if (!name.equals(that.name)) return false; - if (!type.equals(that.type)) return false; + if (!name.equals(that.name)) + return false; + if (!type.equals(that.type)) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { int result = name.hashCode(); result = 31 * result + type.hashCode(); return result; @@ -190,7 +185,7 @@ public int hashCode() { /** * @return the type of a single element of this property, so no Optional or NodeList. */ - public String getTypeNameGenerified() { + public String getTypeNameGenerified() { if (hasWildcard) { return getTypeName() + ""; } @@ -200,14 +195,14 @@ public String getTypeNameGenerified() { /** * @return the raw type of a single element of this property, so nothing but the name. */ - public String getTypeName() { + public String getTypeName() { return type.getSimpleName(); } /** * @return the type that is returned from getters in the AST. */ - public String getTypeNameForGetter() { + public String getTypeNameForGetter() { if (isOptional) { return "Optional<" + getTypeNameForSetter() + ">"; } @@ -217,7 +212,7 @@ public String getTypeNameForGetter() { /** * @return the type that is passed to setters in the AST. */ - public String getTypeNameForSetter() { + public String getTypeNameForSetter() { if (isNodeList) { return "NodeList<" + getTypeNameGenerified() + ">"; } @@ -227,21 +222,21 @@ public String getTypeNameForSetter() { /** * @return is this property an AST Node? */ - public boolean isNode() { + public boolean isNode() { return getNodeReference().isPresent(); } /** * The name of the field in the containing BaseNodeMetaModel for this property meta model. */ - public String getMetaModelFieldName() { + public String getMetaModelFieldName() { return getName() + "PropertyMetaModel"; } /** * @return is this property an attribute, meaning: not a node? */ - public boolean isAttribute() { + public boolean isAttribute() { return !isNode(); } @@ -249,7 +244,7 @@ public boolean isAttribute() { * Introspects the node to get the value from this field. * Note that an optional empty field will return null here. */ - public Object getValue(Node node) { + public Object getValue(Node node) { try { for (Class c = node.getClass(); c != null; c = c.getSuperclass()) { Field[] fields = c.getDeclaredFields(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java index 1100399d5c..4c90e578a9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.ReceiverParameter; import java.util.Optional; +import com.github.javaparser.ast.body.ReceiverParameter; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ReceiverParameterMetaModel extends NodeMetaModel { +public class ReceiverParameterMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ReceiverParameterMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ReceiverParameter.class, - "ReceiverParameter", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, ReceiverParameter.class, "ReceiverParameter", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java index 3b49cf27f5..2122079851 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.RecordDeclaration; import java.util.Optional; +import com.github.javaparser.ast.body.RecordDeclaration; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class RecordDeclarationMetaModel extends TypeDeclarationMetaModel { +public class RecordDeclarationMetaModel extends TypeDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") RecordDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - RecordDeclaration.class, - "RecordDeclaration", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, RecordDeclaration.class, "RecordDeclaration", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel implementedTypesPropertyMetaModel; + public PropertyMetaModel implementedTypesPropertyMetaModel; - public PropertyMetaModel parametersPropertyMetaModel; + public PropertyMetaModel parametersPropertyMetaModel; - public PropertyMetaModel receiverParameterPropertyMetaModel; + public PropertyMetaModel receiverParameterPropertyMetaModel; - public PropertyMetaModel typeParametersPropertyMetaModel; + public PropertyMetaModel typeParametersPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java index e6c2f0cdf5..4e567ef124 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.RecordPatternExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.RecordPatternExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class RecordPatternExprMetaModel extends PatternExprMetaModel { +public class RecordPatternExprMetaModel extends PatternExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") RecordPatternExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - RecordPatternExpr.class, - "RecordPatternExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, RecordPatternExpr.class, "RecordPatternExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel patternListPropertyMetaModel; + public PropertyMetaModel patternListPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java index ef24f2ae06..ac41a9edec 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.type.ReferenceType; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,27 +35,15 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ReferenceTypeMetaModel extends TypeMetaModel { +public class ReferenceTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ReferenceTypeMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - ReferenceType.class, - "ReferenceType", - "com.github.javaparser.ast.type", - true, - false); + super(superBaseNodeMetaModel, ReferenceType.class, "ReferenceType", "com.github.javaparser.ast.type", true, false); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected ReferenceTypeMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected ReferenceTypeMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java index 6b3be0d880..b57ab4fa65 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ReturnStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ReturnStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ReturnStmtMetaModel extends StatementMetaModel { +public class ReturnStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ReturnStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ReturnStmt.class, "ReturnStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java index a1da11bd7b..47372e8c4d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java @@ -34,16 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SignalsClauseMetaModel extends JmlClauseMetaModel { +public class SignalsClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SignalsClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSignalsClause.class, "SignalsClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel exprPropertyMetaModel; + public PropertyMetaModel exprPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java index d33be42012..5e49801e12 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SignalsMetaModel extends JmlClauseMetaModel { +public class SignalsMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SignalsMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java index 3796ae5fc1..efa0a0f76d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SignalsOnlyClauseMetaModel extends JmlClauseMetaModel { +public class SignalsOnlyClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SignalsOnlyClauseMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, JmlSignalsOnlyClause.class, "SignalsOnlyClause", "com.github.javaparser.ast.jml.clauses", false, false); } - public PropertyMetaModel typesPropertyMetaModel; + public PropertyMetaModel typesPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java index 14a283ea92..1f55883a33 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SignalsOnlyMetaModel extends JmlClauseMetaModel { +public class SignalsOnlyMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SignalsOnlyMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java index bbda4650a2..472bfb5cd0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.SimpleName; import java.util.Optional; +import com.github.javaparser.ast.expr.SimpleName; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SimpleNameMetaModel extends NodeMetaModel { +public class SimpleNameMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SimpleNameMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, SimpleName.class, "SimpleName", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel identifierPropertyMetaModel; + public PropertyMetaModel identifierPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java index 192043bd95..dbb962f159 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SingleMemberAnnotationExprMetaModel extends AnnotationExprMetaModel { +public class SingleMemberAnnotationExprMetaModel extends AnnotationExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SingleMemberAnnotationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - SingleMemberAnnotationExpr.class, - "SingleMemberAnnotationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, SingleMemberAnnotationExpr.class, "SingleMemberAnnotationExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel memberValuePropertyMetaModel; + public PropertyMetaModel memberValuePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java index 1e330aa076..8fa974dc4e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.stmt.Statement; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class StatementMetaModel extends NodeMetaModel { +public class StatementMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") StatementMetaModel(Optional superBaseNodeMetaModel) { @@ -43,13 +43,7 @@ public class StatementMetaModel extends NodeMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected StatementMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected StatementMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java index 8df965dcd6..cdf8c90abf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.StringLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.StringLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class StringLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class StringLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") StringLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - StringLiteralExpr.class, - "StringLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, StringLiteralExpr.class, "StringLiteralExpr", "com.github.javaparser.ast.expr", 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 f35dc7125e..39f61f34f5 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 @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.SuperExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.SuperExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SuperExprMetaModel extends ExpressionMetaModel { +public class SuperExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SuperExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, SuperExpr.class, "SuperExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel typeNamePropertyMetaModel; + public PropertyMetaModel typeNamePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java index fe91a4d5a8..7290a9754f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.SwitchEntry; import java.util.Optional; +import com.github.javaparser.ast.stmt.SwitchEntry; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,22 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SwitchEntryMetaModel extends NodeMetaModel { +public class SwitchEntryMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SwitchEntryMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, SwitchEntry.class, "SwitchEntry", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel guardPropertyMetaModel; + public PropertyMetaModel guardPropertyMetaModel; - public PropertyMetaModel isDefaultPropertyMetaModel; + public PropertyMetaModel isDefaultPropertyMetaModel; - public PropertyMetaModel labelsPropertyMetaModel; + public PropertyMetaModel labelsPropertyMetaModel; - public PropertyMetaModel statementsPropertyMetaModel; + public PropertyMetaModel statementsPropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; - public PropertyMetaModel switchStatementEntryPropertyMetaModel; + public PropertyMetaModel switchStatementEntryPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java index 36c583abf2..c187eeab44 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.SwitchExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.SwitchExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SwitchExprMetaModel extends ExpressionMetaModel { +public class SwitchExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SwitchExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, SwitchExpr.class, "SwitchExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel entriesPropertyMetaModel; + public PropertyMetaModel entriesPropertyMetaModel; - public PropertyMetaModel selectorPropertyMetaModel; + public PropertyMetaModel selectorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java index c45c4b9109..a6eb54bb6d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.SwitchStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.SwitchStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SwitchStmtMetaModel extends StatementMetaModel { +public class SwitchStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SwitchStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, SwitchStmt.class, "SwitchStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel entriesPropertyMetaModel; + public PropertyMetaModel entriesPropertyMetaModel; - public PropertyMetaModel selectorPropertyMetaModel; + public PropertyMetaModel selectorPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java index d401297601..7d801a68d3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.SynchronizedStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.SynchronizedStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class SynchronizedStmtMetaModel extends StatementMetaModel { +public class SynchronizedStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") SynchronizedStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - SynchronizedStmt.class, - "SynchronizedStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, SynchronizedStmt.class, "SynchronizedStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java index c600c8e432..859affcec1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.TextBlockLiteralExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.TextBlockLiteralExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TextBlockLiteralExprMetaModel extends LiteralStringValueExprMetaModel { +public class TextBlockLiteralExprMetaModel extends LiteralStringValueExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TextBlockLiteralExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - TextBlockLiteralExpr.class, - "TextBlockLiteralExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, TextBlockLiteralExpr.class, "TextBlockLiteralExpr", "com.github.javaparser.ast.expr", false, false); } } 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 e40cb8f995..8c7f0fcacf 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 @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.ThisExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.ThisExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ThisExprMetaModel extends ExpressionMetaModel { +public class ThisExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ThisExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ThisExpr.class, "ThisExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel typeNamePropertyMetaModel; + public PropertyMetaModel typeNamePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java index f5eddc586a..79f5d6d603 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.ThrowStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.ThrowStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class ThrowStmtMetaModel extends StatementMetaModel { +public class ThrowStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") ThrowStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, ThrowStmt.class, "ThrowStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java index 3bc3e332dd..02a0e9e096 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.TryStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.TryStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TryStmtMetaModel extends StatementMetaModel { +public class TryStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TryStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, TryStmt.class, "TryStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel catchClausesPropertyMetaModel; + public PropertyMetaModel catchClausesPropertyMetaModel; - public PropertyMetaModel finallyBlockPropertyMetaModel; + public PropertyMetaModel finallyBlockPropertyMetaModel; - public PropertyMetaModel resourcesPropertyMetaModel; + public PropertyMetaModel resourcesPropertyMetaModel; - public PropertyMetaModel tryBlockPropertyMetaModel; + public PropertyMetaModel tryBlockPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java index 53e4f7b046..4f4ed4718c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.body.TypeDeclaration; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.body.TypeDeclaration; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,33 +35,21 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TypeDeclarationMetaModel extends BodyDeclarationMetaModel { +public class TypeDeclarationMetaModel extends BodyDeclarationMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TypeDeclarationMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - TypeDeclaration.class, - "TypeDeclaration", - "com.github.javaparser.ast.body", - true, - true); + super(superBaseNodeMetaModel, TypeDeclaration.class, "TypeDeclaration", "com.github.javaparser.ast.body", true, true); } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected TypeDeclarationMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected TypeDeclarationMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel membersPropertyMetaModel; + public PropertyMetaModel membersPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java index b7af87a125..db7a0229e8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.TypeExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.TypeExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TypeExprMetaModel extends ExpressionMetaModel { +public class TypeExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TypeExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, TypeExpr.class, "TypeExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java index 377ea66770..e2710c7137 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java @@ -20,10 +20,10 @@ */ package com.github.javaparser.metamodel; +import java.util.Optional; +import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.Generated; import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.type.Type; -import java.util.Optional; /** * This file, class, and its contents are completely generated based on: @@ -35,7 +35,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TypeMetaModel extends NodeMetaModel { +public class TypeMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TypeMetaModel(Optional superBaseNodeMetaModel) { @@ -43,15 +43,9 @@ public class TypeMetaModel extends NodeMetaModel { } @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") - protected TypeMetaModel( - Optional superNodeMetaModel, - Class type, - String name, - String packageName, - boolean isAbstract, - boolean hasWildcard) { + protected TypeMetaModel(Optional superNodeMetaModel, Class type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java index 0a815a75fb..19b0aefd4b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.TypeParameter; import java.util.Optional; +import com.github.javaparser.ast.type.TypeParameter; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TypeParameterMetaModel extends ReferenceTypeMetaModel { +public class TypeParameterMetaModel extends ReferenceTypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TypeParameterMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - TypeParameter.class, - "TypeParameter", - "com.github.javaparser.ast.type", - false, - false); + super(superBaseNodeMetaModel, TypeParameter.class, "TypeParameter", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typeBoundPropertyMetaModel; + public PropertyMetaModel typeBoundPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java index a5a10483dc..ce9666a322 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.TypePatternExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.TypePatternExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class TypePatternExprMetaModel extends PatternExprMetaModel { +public class TypePatternExprMetaModel extends PatternExprMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") TypePatternExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - TypePatternExpr.class, - "TypePatternExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, TypePatternExpr.class, "TypePatternExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java index 4b19ad7e78..b5c20ff02a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.UnaryExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.UnaryExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,18 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class UnaryExprMetaModel extends ExpressionMetaModel { +public class UnaryExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") UnaryExprMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, UnaryExpr.class, "UnaryExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; - public PropertyMetaModel operatorPropertyMetaModel; + public PropertyMetaModel operatorPropertyMetaModel; - public PropertyMetaModel postfixPropertyMetaModel; + public PropertyMetaModel postfixPropertyMetaModel; - public PropertyMetaModel prefixPropertyMetaModel; + public PropertyMetaModel prefixPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java index 03ecee2f5c..7bad2dedc0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.UnionType; import java.util.Optional; +import com.github.javaparser.ast.type.UnionType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class UnionTypeMetaModel extends TypeMetaModel { +public class UnionTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") UnionTypeMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, UnionType.class, "UnionType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel elementsPropertyMetaModel; + public PropertyMetaModel elementsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java index 669b9a673f..e86280f2fa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.UnknownType; import java.util.Optional; +import com.github.javaparser.ast.type.UnknownType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class UnknownTypeMetaModel extends TypeMetaModel { +public class UnknownTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") UnknownTypeMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java index fc724f8af2..8ac1dae780 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.UnparsableStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.UnparsableStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,16 +34,10 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class UnparsableStmtMetaModel extends StatementMetaModel { +public class UnparsableStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") UnparsableStmtMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - UnparsableStmt.class, - "UnparsableStmt", - "com.github.javaparser.ast.stmt", - false, - false); + super(superBaseNodeMetaModel, UnparsableStmt.class, "UnparsableStmt", "com.github.javaparser.ast.stmt", false, false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java index a7929e118c..d5b80fccbc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class UnreachableStmtMetaModel extends StatementMetaModel { +public class UnreachableStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") UnreachableStmtMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java index 7cf0f432f2..5d94fb8093 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.VarType; import java.util.Optional; +import com.github.javaparser.ast.type.VarType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class VarTypeMetaModel extends TypeMetaModel { +public class VarTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") VarTypeMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java index dec1e3170b..014ea10a41 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.expr.VariableDeclarationExpr; import java.util.Optional; +import com.github.javaparser.ast.expr.VariableDeclarationExpr; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,24 +34,18 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class VariableDeclarationExprMetaModel extends ExpressionMetaModel { +public class VariableDeclarationExprMetaModel extends ExpressionMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") VariableDeclarationExprMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - VariableDeclarationExpr.class, - "VariableDeclarationExpr", - "com.github.javaparser.ast.expr", - false, - false); + super(superBaseNodeMetaModel, VariableDeclarationExpr.class, "VariableDeclarationExpr", "com.github.javaparser.ast.expr", false, false); } - public PropertyMetaModel annotationsPropertyMetaModel; + public PropertyMetaModel annotationsPropertyMetaModel; - public PropertyMetaModel modifiersPropertyMetaModel; + public PropertyMetaModel modifiersPropertyMetaModel; - public PropertyMetaModel variablesPropertyMetaModel; + public PropertyMetaModel variablesPropertyMetaModel; - public PropertyMetaModel maximumCommonTypePropertyMetaModel; + public PropertyMetaModel maximumCommonTypePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java index 8a1560efd8..28ec935555 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.body.VariableDeclarator; import java.util.Optional; +import com.github.javaparser.ast.body.VariableDeclarator; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,22 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class VariableDeclaratorMetaModel extends NodeMetaModel { +public class VariableDeclaratorMetaModel extends NodeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") VariableDeclaratorMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - VariableDeclarator.class, - "VariableDeclarator", - "com.github.javaparser.ast.body", - false, - false); + super(superBaseNodeMetaModel, VariableDeclarator.class, "VariableDeclarator", "com.github.javaparser.ast.body", false, false); } - public PropertyMetaModel initializerPropertyMetaModel; + public PropertyMetaModel initializerPropertyMetaModel; - public PropertyMetaModel namePropertyMetaModel; + public PropertyMetaModel namePropertyMetaModel; - public PropertyMetaModel typePropertyMetaModel; + public PropertyMetaModel typePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java index ab2fdc241b..a104d39115 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.VoidType; import java.util.Optional; +import com.github.javaparser.ast.type.VoidType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class VoidTypeMetaModel extends TypeMetaModel { +public class VoidTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") VoidTypeMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java index 2549fcf1a9..28fa91e886 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.WhileStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.WhileStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,14 +34,16 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class WhileStmtMetaModel extends StatementMetaModel { +public class WhileStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") WhileStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, WhileStmt.class, "WhileStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel bodyPropertyMetaModel; + public PropertyMetaModel bodyPropertyMetaModel; + + public PropertyMetaModel conditionPropertyMetaModel; - public PropertyMetaModel conditionPropertyMetaModel; + public PropertyMetaModel contractsPropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java index 5c8d845dde..e4e1ce3d0f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.type.WildcardType; import java.util.Optional; +import com.github.javaparser.ast.type.WildcardType; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,20 +34,14 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class WildcardTypeMetaModel extends TypeMetaModel { +public class WildcardTypeMetaModel extends TypeMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") WildcardTypeMetaModel(Optional superBaseNodeMetaModel) { - super( - superBaseNodeMetaModel, - WildcardType.class, - "WildcardType", - "com.github.javaparser.ast.type", - false, - false); + super(superBaseNodeMetaModel, WildcardType.class, "WildcardType", "com.github.javaparser.ast.type", false, false); } - public PropertyMetaModel extendedTypePropertyMetaModel; + public PropertyMetaModel extendedTypePropertyMetaModel; - public PropertyMetaModel superTypePropertyMetaModel; + public PropertyMetaModel superTypePropertyMetaModel; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java index d2bde988ed..b906b41355 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java @@ -34,7 +34,7 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class WorkingSpaceClauseMetaModel extends JmlClauseMetaModel { +public class WorkingSpaceClauseMetaModel extends JmlClauseMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") WorkingSpaceClauseMetaModel(Optional superBaseNodeMetaModel) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java index eb48e892d9..bc677f8297 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java @@ -20,9 +20,9 @@ */ package com.github.javaparser.metamodel; -import com.github.javaparser.ast.Generated; -import com.github.javaparser.ast.stmt.YieldStmt; import java.util.Optional; +import com.github.javaparser.ast.stmt.YieldStmt; +import com.github.javaparser.ast.Generated; /** * This file, class, and its contents are completely generated based on: @@ -34,12 +34,12 @@ * For this reason, any changes made directly to this file will be overwritten the next time generators are run. */ @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") -public class YieldStmtMetaModel extends StatementMetaModel { +public class YieldStmtMetaModel extends StatementMetaModel { @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator") YieldStmtMetaModel(Optional superBaseNodeMetaModel) { super(superBaseNodeMetaModel, YieldStmt.class, "YieldStmt", "com.github.javaparser.ast.stmt", false, false); } - public PropertyMetaModel expressionPropertyMetaModel; + public PropertyMetaModel expressionPropertyMetaModel; } 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 f1d17b69c2..47c2453ace 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 @@ -33,10 +33,8 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmConditional; import com.github.javaparser.printer.concretesyntaxmodel.CsmElement; import com.github.javaparser.printer.concretesyntaxmodel.CsmMix; - import java.util.*; import java.util.stream.Collectors; - import static com.github.javaparser.GeneratedJavaParserConstants.*; import static com.github.javaparser.ast.observer.ObservableProperty.*; import static com.github.javaparser.printer.concretesyntaxmodel.CsmConditional.Condition.*; @@ -46,7 +44,7 @@ * The Concrete Syntax Model for a single node type. It knows the syntax used to represent a certain element in Java * code. */ -public class ConcreteSyntaxModel { +public class ConcreteSyntaxModel { private static final Map concreteSyntaxModelByClass = new HashMap<>(); @@ -76,1156 +74,141 @@ private static CsmElement onlineAnnotations() { } private static CsmElement typeParameters() { - return list( - ObservableProperty.TYPE_PARAMETERS, - sequence(comma(), space()), - token(GeneratedJavaParserConstants.LT), - sequence(token(GeneratedJavaParserConstants.GT), space())); + return list(ObservableProperty.TYPE_PARAMETERS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LT), sequence(token(GeneratedJavaParserConstants.GT), space())); } private static CsmElement typeArguments() { - return list( - ObservableProperty.TYPE_ARGUMENTS, - sequence(comma(), space()), - token(GeneratedJavaParserConstants.LT), - sequence(token(GeneratedJavaParserConstants.GT))); + return list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LT), sequence(token(GeneratedJavaParserConstants.GT))); } static { // / // / Body // / - concreteSyntaxModelByClass.put( - AnnotationDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - token(GeneratedJavaParserConstants.AT), - token(GeneratedJavaParserConstants.INTERFACE), - space(), - child(ObservableProperty.NAME), - space(), - token(LBRACE), - newline(), - indent(), - list(ObservableProperty.MEMBERS, newline(), none(), none(), newline()), - unindent(), - token(RBRACE))); - concreteSyntaxModelByClass.put( - AnnotationMemberDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - child(ObservableProperty.TYPE), - space(), - child(ObservableProperty.NAME), - token(LPAREN), - token(RPAREN), - conditional( - ObservableProperty.DEFAULT_VALUE, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants._DEFAULT), - space(), - child(DEFAULT_VALUE))), - semicolon())); - concreteSyntaxModelByClass.put( - ClassOrInterfaceDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - conditional( - ObservableProperty.INTERFACE, - FLAG, - token(GeneratedJavaParserConstants.INTERFACE), - token(GeneratedJavaParserConstants.CLASS)), - space(), - child(ObservableProperty.NAME), - list( - TYPE_PARAMETERS, - sequence(comma(), space()), - string(GeneratedJavaParserConstants.LT), - string(GeneratedJavaParserConstants.GT)), - list( - ObservableProperty.EXTENDED_TYPES, - sequence(string(GeneratedJavaParserConstants.COMMA), space()), - sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), - none()), - list( - ObservableProperty.IMPLEMENTED_TYPES, - sequence(string(GeneratedJavaParserConstants.COMMA), space()), - sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), - none()), - space(), - list( - ObservableProperty.PERMITTED_TYPES, - sequence(string(GeneratedJavaParserConstants.COMMA), space()), - sequence(space(), token(GeneratedJavaParserConstants.PERMITS), space()), - none()), - block(sequence( - newline(), - list( - ObservableProperty.MEMBERS, - sequence(newline(), newline()), - newline(), - newline()))))); - concreteSyntaxModelByClass.put( - ConstructorDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - typeParameters(), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN), - list( - ObservableProperty.THROWN_EXCEPTIONS, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), - none()), - space(), - child(ObservableProperty.BODY))); - concreteSyntaxModelByClass.put( - RecordDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - token(GeneratedJavaParserConstants.RECORD), - space(), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN), - list( - TYPE_PARAMETERS, - sequence(comma(), space()), - string(GeneratedJavaParserConstants.LT), - string(GeneratedJavaParserConstants.GT)), - list( - ObservableProperty.IMPLEMENTED_TYPES, - sequence(string(GeneratedJavaParserConstants.COMMA), space()), - sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), - none()), - space(), - block(sequence( - newline(), - list( - ObservableProperty.MEMBERS, - sequence(newline(), newline()), - newline(), - newline()))))); - concreteSyntaxModelByClass.put( - CompactConstructorDeclaration.class, - sequence( - comment(), - memberAnnotations(), - modifiers(), - typeParameters(), - child(ObservableProperty.NAME), - list( - ObservableProperty.THROWN_EXCEPTIONS, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), - none()), - space(), - child(ObservableProperty.BODY))); - concreteSyntaxModelByClass.put( - EnumConstantDeclaration.class, - sequence( - comment(), - memberAnnotations(), - child(ObservableProperty.NAME), - list( - ObservableProperty.ARGUMENTS, - sequence(comma(), space()), - token(GeneratedJavaParserConstants.LPAREN), - token(GeneratedJavaParserConstants.RPAREN)), - conditional( - CLASS_BODY, - IS_NOT_EMPTY, - sequence( - space(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - indent(), - newline(), - list(ObservableProperty.CLASS_BODY, newline(), newline(), none(), newline()), - unindent(), - token(RBRACE), - newline())))); - concreteSyntaxModelByClass.put( - EnumDeclaration.class, - sequence( - comment(), - annotations(), - modifiers(), - token(GeneratedJavaParserConstants.ENUM), - space(), - child(ObservableProperty.NAME), - list( - ObservableProperty.IMPLEMENTED_TYPES, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), - none()), - space(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - indent(), - newline(), - list(ObservableProperty.ENTRIES, sequence(comma(), newline()), none(), none()), - conditional( - ObservableProperty.MEMBERS, - IS_EMPTY, - conditional(ObservableProperty.ENTRIES, IS_NOT_EMPTY, newline()), - sequence( - semicolon(), - newline(), - newline(), - list(ObservableProperty.MEMBERS, newline(), newline(), none(), newline()))), - unindent(), - token(RBRACE))); - concreteSyntaxModelByClass.put( - FieldDeclaration.class, - sequence( - orphanCommentsBeforeThis(), - comment(), - mix(annotations(), modifiers()), - conditional( - ObservableProperty.VARIABLES, - IS_NOT_EMPTY, - child(ObservableProperty.MAXIMUM_COMMON_TYPE)), - space(), - list(ObservableProperty.VARIABLES, sequence(comma(), space())), - semicolon())); - concreteSyntaxModelByClass.put( - InitializerDeclaration.class, - sequence( - comment(), - conditional( - ObservableProperty.STATIC, - FLAG, - sequence(token(GeneratedJavaParserConstants.STATIC), space())), - child(ObservableProperty.BODY))); - concreteSyntaxModelByClass.put( - MethodDeclaration.class, - sequence( - orphanCommentsBeforeThis(), - comment(), - mix(memberAnnotations(), modifiers()), - typeParameters(), - child(ObservableProperty.TYPE), - space(), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LPAREN), - conditional( - ObservableProperty.RECEIVER_PARAMETER, - IS_PRESENT, - sequence(child(ObservableProperty.RECEIVER_PARAMETER), comma(), space())), - list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN), - list( - ObservableProperty.THROWN_EXCEPTIONS, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), - none()), - conditional( - ObservableProperty.BODY, - IS_PRESENT, - sequence(space(), child(ObservableProperty.BODY)), - semicolon()))); - concreteSyntaxModelByClass.put( - Parameter.class, - sequence( - comment(), - onlineAnnotations(), - modifiers(), - child(ObservableProperty.TYPE), - conditional( - ObservableProperty.VAR_ARGS, - FLAG, - sequence( - list(ObservableProperty.VAR_ARGS_ANNOTATIONS, space(), none(), none()), - token(GeneratedJavaParserConstants.ELLIPSIS))), - space(), - child(ObservableProperty.NAME))); - concreteSyntaxModelByClass.put( - ReceiverParameter.class, - sequence( - comment(), - onlineAnnotations(), - child(ObservableProperty.TYPE), - space(), - child(ObservableProperty.NAME))); - concreteSyntaxModelByClass.put( - VariableDeclarator.class, - sequence( - /* FIXME: we should introduce a derived property */ - comment(), /* list(ObservableProperty.EXTRA_ARRAY_LEVELS), */ - child(ObservableProperty.NAME), - conditional( - ObservableProperty.INITIALIZER, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.ASSIGN), - space(), - child(ObservableProperty.INITIALIZER))))); + concreteSyntaxModelByClass.put(AnnotationDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), token(GeneratedJavaParserConstants.AT), token(GeneratedJavaParserConstants.INTERFACE), space(), child(ObservableProperty.NAME), space(), token(LBRACE), newline(), indent(), list(ObservableProperty.MEMBERS, newline(), none(), none(), newline()), unindent(), token(RBRACE))); + concreteSyntaxModelByClass.put(AnnotationMemberDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME), token(LPAREN), token(RPAREN), conditional(ObservableProperty.DEFAULT_VALUE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants._DEFAULT), space(), child(DEFAULT_VALUE))), semicolon())); + concreteSyntaxModelByClass.put(ClassOrInterfaceDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), conditional(ObservableProperty.INTERFACE, FLAG, token(GeneratedJavaParserConstants.INTERFACE), token(GeneratedJavaParserConstants.CLASS)), space(), child(ObservableProperty.NAME), list(TYPE_PARAMETERS, sequence(comma(), space()), string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), list(ObservableProperty.EXTENDED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), none()), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), list(ObservableProperty.PERMITTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.PERMITS), space()), none()), block(sequence(newline(), list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), newline()))))); + concreteSyntaxModelByClass.put(ConstructorDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), typeParameters(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), space(), child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(RecordDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), token(GeneratedJavaParserConstants.RECORD), space(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(TYPE_PARAMETERS, sequence(comma(), space()), string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), block(sequence(newline(), list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), newline()))))); + concreteSyntaxModelByClass.put(CompactConstructorDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), typeParameters(), child(ObservableProperty.NAME), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), space(), child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(EnumConstantDeclaration.class, sequence(comment(), memberAnnotations(), child(ObservableProperty.NAME), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LPAREN), token(GeneratedJavaParserConstants.RPAREN)), conditional(CLASS_BODY, IS_NOT_EMPTY, sequence(space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), newline(), list(ObservableProperty.CLASS_BODY, newline(), newline(), none(), newline()), unindent(), token(RBRACE), newline())))); + concreteSyntaxModelByClass.put(EnumDeclaration.class, sequence(comment(), annotations(), modifiers(), token(GeneratedJavaParserConstants.ENUM), space(), child(ObservableProperty.NAME), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), newline(), list(ObservableProperty.ENTRIES, sequence(comma(), newline()), none(), none()), conditional(ObservableProperty.MEMBERS, IS_EMPTY, conditional(ObservableProperty.ENTRIES, IS_NOT_EMPTY, newline()), sequence(semicolon(), newline(), newline(), list(ObservableProperty.MEMBERS, newline(), newline(), none(), newline()))), unindent(), token(RBRACE))); + concreteSyntaxModelByClass.put(FieldDeclaration.class, sequence(orphanCommentsBeforeThis(), comment(), mix(annotations(), modifiers()), conditional(ObservableProperty.VARIABLES, IS_NOT_EMPTY, child(ObservableProperty.MAXIMUM_COMMON_TYPE)), space(), list(ObservableProperty.VARIABLES, sequence(comma(), space())), semicolon())); + concreteSyntaxModelByClass.put(InitializerDeclaration.class, sequence(comment(), conditional(ObservableProperty.STATIC, FLAG, sequence(token(GeneratedJavaParserConstants.STATIC), space())), child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(MethodDeclaration.class, sequence(orphanCommentsBeforeThis(), comment(), mix(memberAnnotations(), modifiers()), typeParameters(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), conditional(ObservableProperty.RECEIVER_PARAMETER, IS_PRESENT, sequence(child(ObservableProperty.RECEIVER_PARAMETER), comma(), space())), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), conditional(ObservableProperty.BODY, IS_PRESENT, sequence(space(), child(ObservableProperty.BODY)), semicolon()))); + concreteSyntaxModelByClass.put(Parameter.class, sequence(comment(), onlineAnnotations(), modifiers(), child(ObservableProperty.TYPE), conditional(ObservableProperty.VAR_ARGS, FLAG, sequence(list(ObservableProperty.VAR_ARGS_ANNOTATIONS, space(), none(), none()), token(GeneratedJavaParserConstants.ELLIPSIS))), space(), child(ObservableProperty.NAME))); + concreteSyntaxModelByClass.put(ReceiverParameter.class, sequence(comment(), onlineAnnotations(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME))); + concreteSyntaxModelByClass.put(VariableDeclarator.class, sequence(/* FIXME: we should introduce a derived property */ + comment(), /* list(ObservableProperty.EXTRA_ARRAY_LEVELS), */ + child(ObservableProperty.NAME), conditional(ObservableProperty.INITIALIZER, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.ASSIGN), space(), child(ObservableProperty.INITIALIZER))))); // / // / Expressions // / - concreteSyntaxModelByClass.put( - ArrayAccessExpr.class, - sequence( - comment(), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LBRACKET), - child(ObservableProperty.INDEX), - token(GeneratedJavaParserConstants.RBRACKET))); - concreteSyntaxModelByClass.put( - ArrayCreationExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.NEW), - space(), - child(ObservableProperty.ELEMENT_TYPE), - list(ObservableProperty.LEVELS), - conditional( - ObservableProperty.INITIALIZER, - IS_PRESENT, - sequence(space(), child(ObservableProperty.INITIALIZER))))); - concreteSyntaxModelByClass.put( - ArrayInitializerExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.LBRACE), - list(ObservableProperty.VALUES, sequence(comma(), space()), space(), space()), - orphanCommentsEnding(), - token(RBRACE))); - concreteSyntaxModelByClass.put( - AssignExpr.class, - sequence( - comment(), - child(ObservableProperty.TARGET), - space(), - attribute(ObservableProperty.OPERATOR), - space(), - child(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - BinaryExpr.class, - sequence( - comment(), - child(ObservableProperty.LEFT), - space(), - attribute(ObservableProperty.OPERATOR), - space(), - child(ObservableProperty.RIGHT))); + concreteSyntaxModelByClass.put(ArrayAccessExpr.class, sequence(comment(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LBRACKET), child(ObservableProperty.INDEX), token(GeneratedJavaParserConstants.RBRACKET))); + concreteSyntaxModelByClass.put(ArrayCreationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NEW), space(), child(ObservableProperty.ELEMENT_TYPE), list(ObservableProperty.LEVELS), conditional(ObservableProperty.INITIALIZER, IS_PRESENT, sequence(space(), child(ObservableProperty.INITIALIZER))))); + concreteSyntaxModelByClass.put(ArrayInitializerExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LBRACE), list(ObservableProperty.VALUES, sequence(comma(), space()), space(), space()), orphanCommentsEnding(), token(RBRACE))); + concreteSyntaxModelByClass.put(AssignExpr.class, sequence(comment(), child(ObservableProperty.TARGET), space(), attribute(ObservableProperty.OPERATOR), space(), child(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(BinaryExpr.class, sequence(comment(), child(ObservableProperty.LEFT), space(), attribute(ObservableProperty.OPERATOR), space(), child(ObservableProperty.RIGHT))); concreteSyntaxModelByClass.put(BooleanLiteralExpr.class, sequence(comment(), attribute(VALUE))); - concreteSyntaxModelByClass.put( - CastExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.TYPE), - token(GeneratedJavaParserConstants.RPAREN), - space(), - child(ObservableProperty.EXPRESSION))); + concreteSyntaxModelByClass.put(CastExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.EXPRESSION))); concreteSyntaxModelByClass.put(CharLiteralExpr.class, sequence(comment(), charToken(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - ClassExpr.class, - sequence( - comment(), - child(ObservableProperty.TYPE), - token(GeneratedJavaParserConstants.DOT), - token(GeneratedJavaParserConstants.CLASS))); - concreteSyntaxModelByClass.put( - ConditionalExpr.class, - sequence( - comment(), - child(ObservableProperty.CONDITION), - space(), - token(GeneratedJavaParserConstants.HOOK), - space(), - child(ObservableProperty.THEN_EXPR), - space(), - token(GeneratedJavaParserConstants.COLON), - space(), - child(ObservableProperty.ELSE_EXPR))); - concreteSyntaxModelByClass.put( - DoubleLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - EnclosedExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.INNER), - token(GeneratedJavaParserConstants.RPAREN))); - concreteSyntaxModelByClass.put( - FieldAccessExpr.class, - sequence( - comment(), - child(SCOPE), - token(GeneratedJavaParserConstants.DOT), - child(ObservableProperty.NAME))); - concreteSyntaxModelByClass.put( - InstanceOfExpr.class, - sequence( - comment(), - child(ObservableProperty.EXPRESSION), - space(), - token(GeneratedJavaParserConstants.INSTANCEOF), - space(), - child(ObservableProperty.TYPE))); - concreteSyntaxModelByClass.put( - IntegerLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - LambdaExpr.class, - sequence( - comment(), - conditional( - ObservableProperty.ENCLOSING_PARAMETERS, - FLAG, - token(GeneratedJavaParserConstants.LPAREN)), - list(ObservableProperty.PARAMETERS, sequence(comma(), space())), - conditional( - ObservableProperty.ENCLOSING_PARAMETERS, - FLAG, - token(GeneratedJavaParserConstants.RPAREN)), - space(), - token(GeneratedJavaParserConstants.ARROW), - space(), - conditional( - ObservableProperty.EXPRESSION_BODY, - IS_PRESENT, - child(ObservableProperty.EXPRESSION_BODY), - child(ObservableProperty.BODY)))); + concreteSyntaxModelByClass.put(ClassExpr.class, sequence(comment(), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.DOT), token(GeneratedJavaParserConstants.CLASS))); + concreteSyntaxModelByClass.put(ConditionalExpr.class, sequence(comment(), child(ObservableProperty.CONDITION), space(), token(GeneratedJavaParserConstants.HOOK), space(), child(ObservableProperty.THEN_EXPR), space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.ELSE_EXPR))); + concreteSyntaxModelByClass.put(DoubleLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(EnclosedExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.INNER), token(GeneratedJavaParserConstants.RPAREN))); + concreteSyntaxModelByClass.put(FieldAccessExpr.class, sequence(comment(), child(SCOPE), token(GeneratedJavaParserConstants.DOT), child(ObservableProperty.NAME))); + concreteSyntaxModelByClass.put(InstanceOfExpr.class, sequence(comment(), child(ObservableProperty.EXPRESSION), space(), token(GeneratedJavaParserConstants.INSTANCEOF), space(), child(ObservableProperty.TYPE))); + concreteSyntaxModelByClass.put(IntegerLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(LambdaExpr.class, sequence(comment(), conditional(ObservableProperty.ENCLOSING_PARAMETERS, FLAG, token(GeneratedJavaParserConstants.LPAREN)), list(ObservableProperty.PARAMETERS, sequence(comma(), space())), conditional(ObservableProperty.ENCLOSING_PARAMETERS, FLAG, token(GeneratedJavaParserConstants.RPAREN)), space(), token(GeneratedJavaParserConstants.ARROW), space(), conditional(ObservableProperty.EXPRESSION_BODY, IS_PRESENT, child(ObservableProperty.EXPRESSION_BODY), child(ObservableProperty.BODY)))); concreteSyntaxModelByClass.put(LongLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - MarkerAnnotationExpr.class, - sequence(comment(), token(GeneratedJavaParserConstants.AT), attribute(ObservableProperty.NAME))); - concreteSyntaxModelByClass.put( - MemberValuePair.class, - sequence( - comment(), - child(ObservableProperty.NAME), - space(), - token(GeneratedJavaParserConstants.ASSIGN), - space(), - child(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - MethodCallExpr.class, - sequence( - comment(), - conditional( - ObservableProperty.SCOPE, - IS_PRESENT, - sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), - typeArguments(), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN))); - concreteSyntaxModelByClass.put( - MethodReferenceExpr.class, - sequence( - comment(), - child(ObservableProperty.SCOPE), - token(GeneratedJavaParserConstants.DOUBLECOLON), - typeArguments(), - attribute(ObservableProperty.IDENTIFIER))); + concreteSyntaxModelByClass.put(MarkerAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), attribute(ObservableProperty.NAME))); + concreteSyntaxModelByClass.put(MemberValuePair.class, sequence(comment(), child(ObservableProperty.NAME), space(), token(GeneratedJavaParserConstants.ASSIGN), space(), child(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(MethodCallExpr.class, sequence(comment(), conditional(ObservableProperty.SCOPE, IS_PRESENT, sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), typeArguments(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN))); + concreteSyntaxModelByClass.put(MethodReferenceExpr.class, sequence(comment(), child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOUBLECOLON), typeArguments(), attribute(ObservableProperty.IDENTIFIER))); concreteSyntaxModelByClass.put(Modifier.class, attribute(ObservableProperty.KEYWORD)); - concreteSyntaxModelByClass.put( - Name.class, - sequence( - comment(), - conditional( - ObservableProperty.QUALIFIER, - IS_PRESENT, - sequence(child(ObservableProperty.QUALIFIER), token(GeneratedJavaParserConstants.DOT))), - attribute(ObservableProperty.IDENTIFIER), - orphanCommentsEnding())); - concreteSyntaxModelByClass.put( - NameExpr.class, sequence(comment(), child(ObservableProperty.NAME), orphanCommentsEnding())); - concreteSyntaxModelByClass.put( - NormalAnnotationExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.AT), - child(ObservableProperty.NAME), - conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.LPAREN)), - list(ObservableProperty.PAIRS, sequence(comma(), space())), - conditional( - ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.RPAREN)))); - concreteSyntaxModelByClass.put( - NullLiteralExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NULL))); - concreteSyntaxModelByClass.put( - ObjectCreationExpr.class, - sequence( - comment(), - conditional( - ObservableProperty.SCOPE, - IS_PRESENT, - sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), - token(GeneratedJavaParserConstants.NEW), - space(), - list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(LT), token(GT)), - conditional(ObservableProperty.TYPE_ARGUMENTS, IS_NOT_EMPTY, space()), - child(ObservableProperty.TYPE), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN), - conditional( - ObservableProperty.ANONYMOUS_CLASS_BODY, - IS_PRESENT, - sequence( - space(), - token(LBRACE), - newline(), - indent(), - list( - ObservableProperty.ANONYMOUS_CLASS_BODY, - newline(), - newline(), - newline(), - newline()), - unindent(), - token(RBRACE))))); - concreteSyntaxModelByClass.put( - RecordPatternExpr.class, - sequence( - comment(), - child(ObservableProperty.TYPE), - space(), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.PATTERN_LIST, sequence(comma(), space()), none(), none()), - token(GeneratedJavaParserConstants.RPAREN))); + concreteSyntaxModelByClass.put(Name.class, sequence(comment(), conditional(ObservableProperty.QUALIFIER, IS_PRESENT, sequence(child(ObservableProperty.QUALIFIER), token(GeneratedJavaParserConstants.DOT))), attribute(ObservableProperty.IDENTIFIER), orphanCommentsEnding())); + concreteSyntaxModelByClass.put(NameExpr.class, sequence(comment(), child(ObservableProperty.NAME), orphanCommentsEnding())); + concreteSyntaxModelByClass.put(NormalAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), child(ObservableProperty.NAME), conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.LPAREN)), list(ObservableProperty.PAIRS, sequence(comma(), space())), conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.RPAREN)))); + concreteSyntaxModelByClass.put(NullLiteralExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NULL))); + concreteSyntaxModelByClass.put(ObjectCreationExpr.class, sequence(comment(), conditional(ObservableProperty.SCOPE, IS_PRESENT, sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.NEW), space(), list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(LT), token(GT)), conditional(ObservableProperty.TYPE_ARGUMENTS, IS_NOT_EMPTY, space()), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), conditional(ObservableProperty.ANONYMOUS_CLASS_BODY, IS_PRESENT, sequence(space(), token(LBRACE), newline(), indent(), list(ObservableProperty.ANONYMOUS_CLASS_BODY, newline(), newline(), newline(), newline()), unindent(), token(RBRACE))))); + concreteSyntaxModelByClass.put(RecordPatternExpr.class, sequence(comment(), child(ObservableProperty.TYPE), space(), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PATTERN_LIST, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN))); concreteSyntaxModelByClass.put(SimpleName.class, attribute(ObservableProperty.IDENTIFIER)); - concreteSyntaxModelByClass.put( - SingleMemberAnnotationExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.AT), - child(ObservableProperty.NAME), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.MEMBER_VALUE), - token(GeneratedJavaParserConstants.RPAREN))); - concreteSyntaxModelByClass.put( - StringLiteralExpr.class, sequence(comment(), stringToken(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - SuperExpr.class, - sequence( - comment(), - conditional( - TYPE_NAME, - IS_PRESENT, - sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), - token(GeneratedJavaParserConstants.SUPER))); - concreteSyntaxModelByClass.put( - TextBlockLiteralExpr.class, sequence(comment(), textBlockToken(ObservableProperty.VALUE))); - concreteSyntaxModelByClass.put( - TypePatternExpr.class, - sequence(child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME))); - concreteSyntaxModelByClass.put( - ThisExpr.class, - sequence( - comment(), - conditional( - TYPE_NAME, - IS_PRESENT, - sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), - token(GeneratedJavaParserConstants.THIS))); + concreteSyntaxModelByClass.put(SingleMemberAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.MEMBER_VALUE), token(GeneratedJavaParserConstants.RPAREN))); + concreteSyntaxModelByClass.put(StringLiteralExpr.class, sequence(comment(), stringToken(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(SuperExpr.class, sequence(comment(), conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.SUPER))); + concreteSyntaxModelByClass.put(TextBlockLiteralExpr.class, sequence(comment(), textBlockToken(ObservableProperty.VALUE))); + concreteSyntaxModelByClass.put(TypePatternExpr.class, sequence(child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME))); + concreteSyntaxModelByClass.put(ThisExpr.class, sequence(comment(), conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.THIS))); concreteSyntaxModelByClass.put(TypeExpr.class, sequence(comment(), child(ObservableProperty.TYPE))); - concreteSyntaxModelByClass.put( - UnaryExpr.class, - sequence( - conditional(ObservableProperty.PREFIX, FLAG, attribute(ObservableProperty.OPERATOR)), - child(ObservableProperty.EXPRESSION), - conditional(ObservableProperty.POSTFIX, FLAG, attribute(ObservableProperty.OPERATOR)))); - concreteSyntaxModelByClass.put( - VariableDeclarationExpr.class, - sequence( - comment(), - onlineAnnotations(), - modifiers(), - child(ObservableProperty.MAXIMUM_COMMON_TYPE), - space(), - list(ObservableProperty.VARIABLES, sequence(comma(), space())))); + concreteSyntaxModelByClass.put(UnaryExpr.class, sequence(conditional(ObservableProperty.PREFIX, FLAG, attribute(ObservableProperty.OPERATOR)), child(ObservableProperty.EXPRESSION), conditional(ObservableProperty.POSTFIX, FLAG, attribute(ObservableProperty.OPERATOR)))); + concreteSyntaxModelByClass.put(VariableDeclarationExpr.class, sequence(comment(), onlineAnnotations(), modifiers(), child(ObservableProperty.MAXIMUM_COMMON_TYPE), space(), list(ObservableProperty.VARIABLES, sequence(comma(), space())))); // / // / Statements // / - concreteSyntaxModelByClass.put( - AssertStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.ASSERT), - space(), - child(ObservableProperty.CHECK), - conditional( - ObservableProperty.MESSAGE, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.COLON), - space(), - child(ObservableProperty.MESSAGE))), - semicolon())); - concreteSyntaxModelByClass.put( - BlockStmt.class, - sequence( - orphanCommentsBeforeThis(), - comment(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - list(ObservableProperty.STATEMENTS, newline(), indent(), sequence(newline(), unindent())), - orphanCommentsEnding(), - token(RBRACE))); - concreteSyntaxModelByClass.put( - BreakStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.BREAK), - conditional( - ObservableProperty.LABEL, - IS_PRESENT, - sequence(space(), child(ObservableProperty.LABEL))), - semicolon())); - concreteSyntaxModelByClass.put( - CatchClause.class, - sequence( - comment(), - space(), - token(GeneratedJavaParserConstants.CATCH), - space(), - token(LPAREN), - child(ObservableProperty.PARAMETER), - token(RPAREN), - space(), - child(BODY))); - concreteSyntaxModelByClass.put( - ContinueStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.CONTINUE), - conditional( - ObservableProperty.LABEL, - IS_PRESENT, - sequence(space(), child(ObservableProperty.LABEL))), - semicolon())); - concreteSyntaxModelByClass.put( - DoStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.DO), - space(), - child(ObservableProperty.BODY), - space(), - token(GeneratedJavaParserConstants.WHILE), - space(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.CONDITION), - token(GeneratedJavaParserConstants.RPAREN), - semicolon())); - concreteSyntaxModelByClass.put( - EmptyStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON))); - concreteSyntaxModelByClass.put( - UnparsableStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON))); - concreteSyntaxModelByClass.put( - ExplicitConstructorInvocationStmt.class, - sequence( - comment(), - conditional( - ObservableProperty.THIS, - FLAG, - sequence(typeArguments(), token(GeneratedJavaParserConstants.THIS)), - sequence( - conditional( - ObservableProperty.EXPRESSION, - IS_PRESENT, - sequence( - child(ObservableProperty.EXPRESSION), - token(GeneratedJavaParserConstants.DOT))), - typeArguments(), - token(GeneratedJavaParserConstants.SUPER))), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.ARGUMENTS, sequence(comma(), space())), - token(GeneratedJavaParserConstants.RPAREN), - semicolon())); - concreteSyntaxModelByClass.put( - ExpressionStmt.class, - sequence(orphanCommentsBeforeThis(), comment(), child(ObservableProperty.EXPRESSION), semicolon())); - concreteSyntaxModelByClass.put( - ForEachStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.FOR), - space(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.VARIABLE), - space(), - token(GeneratedJavaParserConstants.COLON), - space(), - child(ObservableProperty.ITERABLE), - token(GeneratedJavaParserConstants.RPAREN), - space(), - child(ObservableProperty.BODY))); - concreteSyntaxModelByClass.put( - ForStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.FOR), - space(), - token(GeneratedJavaParserConstants.LPAREN), - list(ObservableProperty.INITIALIZATION, sequence(comma(), space())), - semicolon(), - space(), - child(ObservableProperty.COMPARE), - semicolon(), - space(), - list(ObservableProperty.UPDATE, sequence(comma(), space())), - token(GeneratedJavaParserConstants.RPAREN), - space(), - child(ObservableProperty.BODY))); - concreteSyntaxModelByClass.put( - IfStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.IF), - space(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.CONDITION), - token(GeneratedJavaParserConstants.RPAREN), - conditional( - ObservableProperty.THEN_BLOCK, - CsmConditional.Condition.FLAG, - sequence( - space(), - child(ObservableProperty.THEN_STMT), - conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, space())), - sequence( - newline(), - indent(), - child(ObservableProperty.THEN_STMT), - conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, newline()), - unindent())), - conditional( - ObservableProperty.ELSE_STMT, - IS_PRESENT, - sequence( - token(GeneratedJavaParserConstants.ELSE), - conditional( - Arrays.asList( - ObservableProperty.ELSE_BLOCK, - ObservableProperty.CASCADING_IF_STMT), - CsmConditional.Condition.FLAG, - sequence(space(), child(ObservableProperty.ELSE_STMT)), - sequence( - newline(), - indent(), - child(ObservableProperty.ELSE_STMT), - unindent())))))); - concreteSyntaxModelByClass.put( - LabeledStmt.class, - sequence( - comment(), - child(ObservableProperty.LABEL), - token(GeneratedJavaParserConstants.COLON), - space(), - child(ObservableProperty.STATEMENT))); - concreteSyntaxModelByClass.put( - LocalClassDeclarationStmt.class, sequence(comment(), child(ObservableProperty.CLASS_DECLARATION))); - concreteSyntaxModelByClass.put( - LocalRecordDeclarationStmt.class, sequence(comment(), child(ObservableProperty.RECORD_DECLARATION))); - concreteSyntaxModelByClass.put( - ReturnStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.RETURN), - conditional( - ObservableProperty.EXPRESSION, - IS_PRESENT, - sequence(space(), child(ObservableProperty.EXPRESSION))), - semicolon())); - concreteSyntaxModelByClass.put( - YieldStmt.class, - sequence( - comment(), - token(YIELD), - conditional( - ObservableProperty.EXPRESSION, - IS_PRESENT, - sequence(space(), child(ObservableProperty.EXPRESSION))), - semicolon())); - concreteSyntaxModelByClass.put( - SwitchEntry.class, - sequence( - comment(), - conditional( - SWITCH_STATEMENT_ENTRY, - FLAG, - conditional( - ObservableProperty.LABELS, - IS_NOT_EMPTY, - sequence( - token(GeneratedJavaParserConstants.CASE), - space(), - list(ObservableProperty.LABELS), - token(GeneratedJavaParserConstants.COLON)), - sequence( - token(GeneratedJavaParserConstants._DEFAULT), - token(GeneratedJavaParserConstants.COLON))), - conditional( - ObservableProperty.LABELS, - IS_NOT_EMPTY, - conditional( - ObservableProperty.DEFAULT, - FLAG, - sequence( - token(GeneratedJavaParserConstants.CASE), - space(), - list(ObservableProperty.LABELS), - comma(), - space(), - token(GeneratedJavaParserConstants._DEFAULT), - space(), - token(GeneratedJavaParserConstants.ARROW)), - sequence( - token(GeneratedJavaParserConstants.CASE), - space(), - list(ObservableProperty.LABELS), - conditional( - ObservableProperty.GUARD, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.WHEN), - space(), - child(ObservableProperty.GUARD))), - space(), - token(GeneratedJavaParserConstants.ARROW))), - sequence( - token(GeneratedJavaParserConstants._DEFAULT), - space(), - token(GeneratedJavaParserConstants.ARROW)))), - newline(), - indent(), - list(ObservableProperty.STATEMENTS, newline(), none(), newline()), - unindent())); - concreteSyntaxModelByClass.put( - SwitchStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.SWITCH), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.SELECTOR), - token(GeneratedJavaParserConstants.RPAREN), - space(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - list(ObservableProperty.ENTRIES, none(), indent(), unindent()), - token(GeneratedJavaParserConstants.RBRACE))); - concreteSyntaxModelByClass.put( - SwitchExpr.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.SWITCH), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.SELECTOR), - token(GeneratedJavaParserConstants.RPAREN), - space(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - list(ObservableProperty.ENTRIES, none(), indent(), unindent()), - token(GeneratedJavaParserConstants.RBRACE))); - concreteSyntaxModelByClass.put( - SynchronizedStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.SYNCHRONIZED), - space(), - token(LPAREN), - child(EXPRESSION), - token(RPAREN), - space(), - child(BODY))); - concreteSyntaxModelByClass.put( - ThrowStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.THROW), - space(), - child(ObservableProperty.EXPRESSION), - semicolon())); - concreteSyntaxModelByClass.put( - TryStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.TRY), - space(), - conditional( - ObservableProperty.RESOURCES, - CsmConditional.Condition.IS_NOT_EMPTY, - sequence( - token(LPAREN), - list( - ObservableProperty.RESOURCES, - sequence(semicolon(), newline()), - indent(), - unindent()), - token(RPAREN), - space())), - child(ObservableProperty.TRY_BLOCK), - list(ObservableProperty.CATCH_CLAUSES), - conditional( - ObservableProperty.FINALLY_BLOCK, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.FINALLY), - space(), - child(ObservableProperty.FINALLY_BLOCK))))); - concreteSyntaxModelByClass.put( - WhileStmt.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.WHILE), - space(), - token(GeneratedJavaParserConstants.LPAREN), - child(ObservableProperty.CONDITION), - token(GeneratedJavaParserConstants.RPAREN), - space(), - child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(AssertStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.ASSERT), space(), child(ObservableProperty.CHECK), conditional(ObservableProperty.MESSAGE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.MESSAGE))), semicolon())); + concreteSyntaxModelByClass.put(BlockStmt.class, sequence(orphanCommentsBeforeThis(), comment(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.STATEMENTS, newline(), indent(), sequence(newline(), unindent())), orphanCommentsEnding(), token(RBRACE))); + concreteSyntaxModelByClass.put(BreakStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.BREAK), conditional(ObservableProperty.LABEL, IS_PRESENT, sequence(space(), child(ObservableProperty.LABEL))), semicolon())); + concreteSyntaxModelByClass.put(CatchClause.class, sequence(comment(), space(), token(GeneratedJavaParserConstants.CATCH), space(), token(LPAREN), child(ObservableProperty.PARAMETER), token(RPAREN), space(), child(BODY))); + concreteSyntaxModelByClass.put(ContinueStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.CONTINUE), conditional(ObservableProperty.LABEL, IS_PRESENT, sequence(space(), child(ObservableProperty.LABEL))), semicolon())); + concreteSyntaxModelByClass.put(DoStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.DO), space(), child(ObservableProperty.BODY), space(), token(GeneratedJavaParserConstants.WHILE), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), semicolon())); + concreteSyntaxModelByClass.put(EmptyStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON))); + concreteSyntaxModelByClass.put(UnparsableStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON))); + concreteSyntaxModelByClass.put(ExplicitConstructorInvocationStmt.class, sequence(comment(), conditional(ObservableProperty.THIS, FLAG, sequence(typeArguments(), token(GeneratedJavaParserConstants.THIS)), sequence(conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(child(ObservableProperty.EXPRESSION), token(GeneratedJavaParserConstants.DOT))), typeArguments(), token(GeneratedJavaParserConstants.SUPER))), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space())), token(GeneratedJavaParserConstants.RPAREN), semicolon())); + concreteSyntaxModelByClass.put(ExpressionStmt.class, sequence(orphanCommentsBeforeThis(), comment(), child(ObservableProperty.EXPRESSION), semicolon())); + concreteSyntaxModelByClass.put(ForEachStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.FOR), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.VARIABLE), space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.ITERABLE), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(ForStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.FOR), space(), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.INITIALIZATION, sequence(comma(), space())), semicolon(), space(), child(ObservableProperty.COMPARE), semicolon(), space(), list(ObservableProperty.UPDATE, sequence(comma(), space())), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY))); + concreteSyntaxModelByClass.put(IfStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.IF), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), conditional(ObservableProperty.THEN_BLOCK, CsmConditional.Condition.FLAG, sequence(space(), child(ObservableProperty.THEN_STMT), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, space())), sequence(newline(), indent(), child(ObservableProperty.THEN_STMT), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, newline()), unindent())), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, sequence(token(GeneratedJavaParserConstants.ELSE), conditional(Arrays.asList(ObservableProperty.ELSE_BLOCK, ObservableProperty.CASCADING_IF_STMT), CsmConditional.Condition.FLAG, sequence(space(), child(ObservableProperty.ELSE_STMT)), sequence(newline(), indent(), child(ObservableProperty.ELSE_STMT), unindent())))))); + concreteSyntaxModelByClass.put(LabeledStmt.class, sequence(comment(), child(ObservableProperty.LABEL), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.STATEMENT))); + concreteSyntaxModelByClass.put(LocalClassDeclarationStmt.class, sequence(comment(), child(ObservableProperty.CLASS_DECLARATION))); + concreteSyntaxModelByClass.put(LocalRecordDeclarationStmt.class, sequence(comment(), child(ObservableProperty.RECORD_DECLARATION))); + concreteSyntaxModelByClass.put(ReturnStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.RETURN), conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(space(), child(ObservableProperty.EXPRESSION))), semicolon())); + concreteSyntaxModelByClass.put(YieldStmt.class, sequence(comment(), token(YIELD), conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(space(), child(ObservableProperty.EXPRESSION))), semicolon())); + concreteSyntaxModelByClass.put(SwitchEntry.class, sequence(comment(), conditional(SWITCH_STATEMENT_ENTRY, FLAG, conditional(ObservableProperty.LABELS, IS_NOT_EMPTY, sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), token(GeneratedJavaParserConstants.COLON)), sequence(token(GeneratedJavaParserConstants._DEFAULT), token(GeneratedJavaParserConstants.COLON))), conditional(ObservableProperty.LABELS, IS_NOT_EMPTY, conditional(ObservableProperty.DEFAULT, FLAG, sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), comma(), space(), token(GeneratedJavaParserConstants._DEFAULT), space(), token(GeneratedJavaParserConstants.ARROW)), sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), conditional(ObservableProperty.GUARD, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.WHEN), space(), child(ObservableProperty.GUARD))), space(), token(GeneratedJavaParserConstants.ARROW))), sequence(token(GeneratedJavaParserConstants._DEFAULT), space(), token(GeneratedJavaParserConstants.ARROW)))), newline(), indent(), list(ObservableProperty.STATEMENTS, newline(), none(), newline()), unindent())); + concreteSyntaxModelByClass.put(SwitchStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SWITCH), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.SELECTOR), token(GeneratedJavaParserConstants.RPAREN), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.ENTRIES, none(), indent(), unindent()), token(GeneratedJavaParserConstants.RBRACE))); + concreteSyntaxModelByClass.put(SwitchExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.SWITCH), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.SELECTOR), token(GeneratedJavaParserConstants.RPAREN), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.ENTRIES, none(), indent(), unindent()), token(GeneratedJavaParserConstants.RBRACE))); + concreteSyntaxModelByClass.put(SynchronizedStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SYNCHRONIZED), space(), token(LPAREN), child(EXPRESSION), token(RPAREN), space(), child(BODY))); + concreteSyntaxModelByClass.put(ThrowStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.THROW), space(), child(ObservableProperty.EXPRESSION), semicolon())); + concreteSyntaxModelByClass.put(TryStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.TRY), space(), conditional(ObservableProperty.RESOURCES, CsmConditional.Condition.IS_NOT_EMPTY, sequence(token(LPAREN), list(ObservableProperty.RESOURCES, sequence(semicolon(), newline()), indent(), unindent()), token(RPAREN), space())), child(ObservableProperty.TRY_BLOCK), list(ObservableProperty.CATCH_CLAUSES), conditional(ObservableProperty.FINALLY_BLOCK, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.FINALLY), space(), child(ObservableProperty.FINALLY_BLOCK))))); + concreteSyntaxModelByClass.put(WhileStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.WHILE), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY))); // / // / Types // / - concreteSyntaxModelByClass.put( - ArrayType.class, - sequence( - child(ObservableProperty.COMPONENT_TYPE), - list(ObservableProperty.ANNOTATIONS), - string(GeneratedJavaParserConstants.LBRACKET), - string(GeneratedJavaParserConstants.RBRACKET))); - concreteSyntaxModelByClass.put( - ClassOrInterfaceType.class, - sequence( - comment(), - conditional( - SCOPE, IS_PRESENT, sequence(child(SCOPE), string(GeneratedJavaParserConstants.DOT))), - list(ANNOTATIONS, space(), none(), space()), - child(NAME), - conditional( - ObservableProperty.USING_DIAMOND_OPERATOR, - FLAG, - sequence( - string(GeneratedJavaParserConstants.LT), - string(GeneratedJavaParserConstants.GT)), - typeArguments()))); - concreteSyntaxModelByClass.put( - IntersectionType.class, - sequence( - comment(), - annotations(), - list( - ObservableProperty.ELEMENTS, - sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space())))); - concreteSyntaxModelByClass.put( - PrimitiveType.class, - sequence(comment(), list(ObservableProperty.ANNOTATIONS), attribute(ObservableProperty.TYPE))); - concreteSyntaxModelByClass.put( - TypeParameter.class, - sequence( - comment(), - annotations(), - child(ObservableProperty.NAME), - list( - ObservableProperty.TYPE_BOUND, - sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()), - sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), - none()))); - concreteSyntaxModelByClass.put( - UnionType.class, - sequence( - comment(), - annotations(), - list( - ObservableProperty.ELEMENTS, - sequence(space(), token(GeneratedJavaParserConstants.BIT_OR), space())))); + concreteSyntaxModelByClass.put(ArrayType.class, sequence(child(ObservableProperty.COMPONENT_TYPE), list(ObservableProperty.ANNOTATIONS), string(GeneratedJavaParserConstants.LBRACKET), string(GeneratedJavaParserConstants.RBRACKET))); + concreteSyntaxModelByClass.put(ClassOrInterfaceType.class, sequence(comment(), conditional(SCOPE, IS_PRESENT, sequence(child(SCOPE), string(GeneratedJavaParserConstants.DOT))), list(ANNOTATIONS, space(), none(), space()), child(NAME), conditional(ObservableProperty.USING_DIAMOND_OPERATOR, FLAG, sequence(string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), typeArguments()))); + concreteSyntaxModelByClass.put(IntersectionType.class, sequence(comment(), annotations(), list(ObservableProperty.ELEMENTS, sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space())))); + concreteSyntaxModelByClass.put(PrimitiveType.class, sequence(comment(), list(ObservableProperty.ANNOTATIONS), attribute(ObservableProperty.TYPE))); + concreteSyntaxModelByClass.put(TypeParameter.class, sequence(comment(), annotations(), child(ObservableProperty.NAME), list(ObservableProperty.TYPE_BOUND, sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()), sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), none()))); + concreteSyntaxModelByClass.put(UnionType.class, sequence(comment(), annotations(), list(ObservableProperty.ELEMENTS, sequence(space(), token(GeneratedJavaParserConstants.BIT_OR), space())))); concreteSyntaxModelByClass.put(UnknownType.class, none()); - concreteSyntaxModelByClass.put( - VoidType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.VOID))); - concreteSyntaxModelByClass.put( - VarType.class, - sequence(comment(), annotations(), string(GeneratedJavaParserConstants.IDENTIFIER, "var"))); - concreteSyntaxModelByClass.put( - WildcardType.class, - sequence( - comment(), - annotations(), - token(GeneratedJavaParserConstants.HOOK), - conditional( - ObservableProperty.EXTENDED_TYPE, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.EXTENDS), - space(), - child(EXTENDED_TYPE))), - conditional( - ObservableProperty.SUPER_TYPE, - IS_PRESENT, - sequence( - space(), - token(GeneratedJavaParserConstants.SUPER), - space(), - child(SUPER_TYPE))))); + concreteSyntaxModelByClass.put(VoidType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.VOID))); + concreteSyntaxModelByClass.put(VarType.class, sequence(comment(), annotations(), string(GeneratedJavaParserConstants.IDENTIFIER, "var"))); + concreteSyntaxModelByClass.put(WildcardType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.HOOK), conditional(ObservableProperty.EXTENDED_TYPE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space(), child(EXTENDED_TYPE))), conditional(ObservableProperty.SUPER_TYPE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.SUPER), space(), child(SUPER_TYPE))))); // / // / Top Level // / - concreteSyntaxModelByClass.put( - ArrayCreationLevel.class, - sequence( - annotations(), - token(GeneratedJavaParserConstants.LBRACKET), - child(ObservableProperty.DIMENSION), - token(GeneratedJavaParserConstants.RBRACKET))); - concreteSyntaxModelByClass.put( - CompilationUnit.class, - sequence( - comment(), - child(ObservableProperty.PACKAGE_DECLARATION), - list(ObservableProperty.IMPORTS, newline(), none(), sequence(newline(), newline())), - list(TYPES, newline(), newline(), none(), newline()), - child(ObservableProperty.MODULE), - orphanCommentsEnding())); - concreteSyntaxModelByClass.put( - ImportDeclaration.class, - sequence( - comment(), - token(GeneratedJavaParserConstants.IMPORT), - space(), - conditional( - ObservableProperty.STATIC, - FLAG, - sequence(token(GeneratedJavaParserConstants.STATIC), space())), - child(ObservableProperty.NAME), - conditional( - ASTERISK, - FLAG, - sequence( - token(GeneratedJavaParserConstants.DOT), - token(GeneratedJavaParserConstants.STAR))), - semicolon(), - orphanCommentsEnding())); - concreteSyntaxModelByClass.put( - PackageDeclaration.class, - sequence( - comment(), - memberAnnotations(), - token(GeneratedJavaParserConstants.PACKAGE), - space(), - child(ObservableProperty.NAME), - semicolon(), - newline(), - newline(), - orphanCommentsEnding())); + concreteSyntaxModelByClass.put(ArrayCreationLevel.class, sequence(annotations(), token(GeneratedJavaParserConstants.LBRACKET), child(ObservableProperty.DIMENSION), token(GeneratedJavaParserConstants.RBRACKET))); + concreteSyntaxModelByClass.put(CompilationUnit.class, sequence(comment(), child(ObservableProperty.PACKAGE_DECLARATION), list(ObservableProperty.IMPORTS, newline(), none(), sequence(newline(), newline())), list(TYPES, newline(), newline(), none(), newline()), child(ObservableProperty.MODULE), orphanCommentsEnding())); + concreteSyntaxModelByClass.put(ImportDeclaration.class, sequence(comment(), token(GeneratedJavaParserConstants.IMPORT), space(), conditional(ObservableProperty.STATIC, FLAG, sequence(token(GeneratedJavaParserConstants.STATIC), space())), child(ObservableProperty.NAME), conditional(ASTERISK, FLAG, sequence(token(GeneratedJavaParserConstants.DOT), token(GeneratedJavaParserConstants.STAR))), semicolon(), orphanCommentsEnding())); + concreteSyntaxModelByClass.put(PackageDeclaration.class, sequence(comment(), memberAnnotations(), token(GeneratedJavaParserConstants.PACKAGE), space(), child(ObservableProperty.NAME), semicolon(), newline(), newline(), orphanCommentsEnding())); // / // / Module info // / - concreteSyntaxModelByClass.put( - ModuleDeclaration.class, - sequence( - memberAnnotations(), - conditional( - ObservableProperty.OPEN, - FLAG, - sequence(token(GeneratedJavaParserConstants.OPEN), space())), - token(GeneratedJavaParserConstants.MODULE), - space(), - child(ObservableProperty.NAME), - space(), - token(GeneratedJavaParserConstants.LBRACE), - newline(), - indent(), - list(ObservableProperty.DIRECTIVES), - unindent(), - token(GeneratedJavaParserConstants.RBRACE), - newline())); - concreteSyntaxModelByClass.put( - ModuleExportsDirective.class, - sequence( - token(GeneratedJavaParserConstants.EXPORTS), - space(), - child(ObservableProperty.NAME), - list( - ObservableProperty.MODULE_NAMES, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.TO), space()), - none()), - semicolon(), - newline())); - concreteSyntaxModelByClass.put( - ModuleOpensDirective.class, - sequence( - token(GeneratedJavaParserConstants.OPENS), - space(), - child(ObservableProperty.NAME), - list( - ObservableProperty.MODULE_NAMES, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.TO), space()), - none()), - semicolon(), - newline())); - concreteSyntaxModelByClass.put( - ModuleProvidesDirective.class, - sequence( - token(GeneratedJavaParserConstants.PROVIDES), - space(), - child(ObservableProperty.NAME), - list( - ObservableProperty.WITH, - sequence(comma(), space()), - sequence(space(), token(GeneratedJavaParserConstants.WITH), space()), - none()), - semicolon(), - newline())); - concreteSyntaxModelByClass.put( - ModuleRequiresDirective.class, - sequence( - token(GeneratedJavaParserConstants.REQUIRES), - space(), - modifiers(), - child(ObservableProperty.NAME), - semicolon(), - newline())); - concreteSyntaxModelByClass.put( - ModuleUsesDirective.class, - sequence( - token(GeneratedJavaParserConstants.USES), - space(), - child(ObservableProperty.NAME), - semicolon(), - newline())); - List unsupportedNodeClassNames = JavaParserMetaModel.getNodeMetaModels().stream() - .filter(c -> !c.isAbstract() - && !Comment.class.isAssignableFrom(c.getType()) - && !concreteSyntaxModelByClass.containsKey(c.getType())) - .map(nm -> nm.getType().getSimpleName()) - .collect(Collectors.toList()); + concreteSyntaxModelByClass.put(ModuleDeclaration.class, sequence(memberAnnotations(), conditional(ObservableProperty.OPEN, FLAG, sequence(token(GeneratedJavaParserConstants.OPEN), space())), token(GeneratedJavaParserConstants.MODULE), space(), child(ObservableProperty.NAME), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), list(ObservableProperty.DIRECTIVES), unindent(), token(GeneratedJavaParserConstants.RBRACE), newline())); + concreteSyntaxModelByClass.put(ModuleExportsDirective.class, sequence(token(GeneratedJavaParserConstants.EXPORTS), space(), child(ObservableProperty.NAME), list(ObservableProperty.MODULE_NAMES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.TO), space()), none()), semicolon(), newline())); + concreteSyntaxModelByClass.put(ModuleOpensDirective.class, sequence(token(GeneratedJavaParserConstants.OPENS), space(), child(ObservableProperty.NAME), list(ObservableProperty.MODULE_NAMES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.TO), space()), none()), semicolon(), newline())); + concreteSyntaxModelByClass.put(ModuleProvidesDirective.class, sequence(token(GeneratedJavaParserConstants.PROVIDES), space(), child(ObservableProperty.NAME), list(ObservableProperty.WITH, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.WITH), space()), none()), semicolon(), newline())); + concreteSyntaxModelByClass.put(ModuleRequiresDirective.class, sequence(token(GeneratedJavaParserConstants.REQUIRES), space(), modifiers(), child(ObservableProperty.NAME), semicolon(), newline())); + concreteSyntaxModelByClass.put(ModuleUsesDirective.class, sequence(token(GeneratedJavaParserConstants.USES), space(), child(ObservableProperty.NAME), semicolon(), newline())); + List unsupportedNodeClassNames = JavaParserMetaModel.getNodeMetaModels().stream().filter(c -> !c.isAbstract() && !Comment.class.isAssignableFrom(c.getType()) && !concreteSyntaxModelByClass.containsKey(c.getType())).map(nm -> nm.getType().getSimpleName()).collect(Collectors.toList()); if (unsupportedNodeClassNames.isEmpty()) { initializationError = Optional.empty(); } else { - initializationError = Optional.of("The " + ConcreteSyntaxModel.class.getSimpleName() - + " should include support for these classes: " + String.join(", ", unsupportedNodeClassNames)); + initializationError = Optional.of("The " + ConcreteSyntaxModel.class.getSimpleName() + " should include support for these classes: " + String.join(", ", unsupportedNodeClassNames)); } } - private ConcreteSyntaxModel() {} + private ConcreteSyntaxModel() { + } public static void genericPrettyPrint(Node node, SourcePrinter printer) { forClass(node.getClass()).prettyPrint(node, printer); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java index 2a4d3c5818..517c1af853 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java @@ -29,7 +29,7 @@ /** * Pretty printer for AST nodes. */ -public class DefaultPrettyPrinter implements Printer { +public class DefaultPrettyPrinter implements Printer { private PrinterConfiguration configuration; @@ -49,7 +49,7 @@ private static PrinterConfiguration createDefaultConfiguration() { /** * Build a new DefaultPrettyPrinter with a default configuration and a default factory */ - public DefaultPrettyPrinter() { + public DefaultPrettyPrinter() { this(createDefaultConfiguration()); } @@ -58,7 +58,7 @@ public DefaultPrettyPrinter() { * * @param configuration */ - public DefaultPrettyPrinter(PrinterConfiguration configuration) { + public DefaultPrettyPrinter(PrinterConfiguration configuration) { this(createDefaultVisitor(), configuration); } @@ -68,8 +68,7 @@ public DefaultPrettyPrinter(PrinterConfiguration configuration) { * @param visitorFactory * @param configuration Configuration to apply */ - public DefaultPrettyPrinter( - Function> visitorFactory, PrinterConfiguration configuration) { + public DefaultPrettyPrinter(Function> visitorFactory, PrinterConfiguration configuration) { this.configuration = configuration; this.visitorFactory = visitorFactory; } @@ -78,20 +77,20 @@ public DefaultPrettyPrinter( /* * Returns the Printer configuration */ - public PrinterConfiguration getConfiguration() { + public PrinterConfiguration getConfiguration() { return configuration; } /* * set or update the PrettyPrinter configuration */ - public Printer setConfiguration(PrinterConfiguration configuration) { + public Printer setConfiguration(PrinterConfiguration configuration) { this.configuration = configuration; return this; } @Override - public String print(Node node) { + public String print(Node node) { // lazy initialization of visitor which can have a state (like a buffer) VoidVisitor visitor = visitorFactory.apply(configuration); node.accept(visitor, null); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java index 6f4b18e851..63567ab526 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java @@ -23,11 +23,10 @@ import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition; import static com.github.javaparser.utils.Utils.*; import static java.util.stream.Collectors.joining; - import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; - +import com.github.javaparser.Position; import com.github.javaparser.ast.*; import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.comments.BlockComment; @@ -35,6 +34,12 @@ import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.jml.*; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.expr.*; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.nodeTypes.NodeWithTraversableScope; import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments; @@ -54,7 +59,7 @@ /** * Outputs the AST as formatted Java source code. */ -public class DefaultPrettyPrinterVisitor implements VoidVisitor { +public class DefaultPrettyPrinterVisitor implements VoidVisitor { private static Pattern RTRIM = Pattern.compile("\\s+$"); @@ -68,29 +73,26 @@ public class DefaultPrettyPrinterVisitor implements VoidVisitor { private Position jmlOpenColumn; - public DefaultPrettyPrinterVisitor(PrinterConfiguration configuration) { + public DefaultPrettyPrinterVisitor(PrinterConfiguration configuration) { this(configuration, new SourcePrinter(configuration)); } - public DefaultPrettyPrinterVisitor(PrinterConfiguration configuration, SourcePrinter printer) { + public DefaultPrettyPrinterVisitor(PrinterConfiguration configuration, SourcePrinter printer) { this.configuration = configuration; this.printer = printer; } @Override - public String toString() { + public String toString() { return printer.toString(); } protected void printModifiers(final NodeList modifiers) { if (modifiers.size() > 0) { - printer.print( - modifiers.stream() - .map(Modifier::getKeyword) - .map(Modifier.Keyword::asString) - .collect(joining(" ")) + " "); - if (!modifiers.isEmpty()) { - printer.print(modifiers.stream().map(Modifier::getKeyword).map(it -> !inJmlComment() && it.name().startsWith("JML_") ? "/*@ " + it.asString() + " */" : it.asString()).collect(joining(" ")) + " "); + printer.print(modifiers.stream().map(Modifier::getKeyword).map(Modifier.Keyword::asString).collect(joining(" ")) + " "); + if (!modifiers.isEmpty()) { + printer.print(modifiers.stream().map(Modifier::getKeyword).map(it -> !inJmlComment() && it.name().startsWith("JML_") ? "/*@ " + it.asString() + " */" : it.asString()).collect(joining(" ")) + " "); + } } } @@ -116,8 +118,7 @@ protected void printMemberAnnotations(final NodeList annotations } } - protected void printAnnotations( - final NodeList annotations, boolean prefixWithASpace, final Void arg) { + protected void printAnnotations(final NodeList annotations, boolean prefixWithASpace, final Void arg) { if (annotations.isEmpty()) { return; } @@ -162,8 +163,7 @@ protected void printTypeParameters(final NodeList args, final Voi protected void printArguments(final NodeList args, final Void arg) { printer.print("("); if (!isNullOrEmpty(args)) { - boolean columnAlignParameters = (args.size() > 1) - && getOption(ConfigOption.COLUMN_ALIGN_PARAMETERS).isPresent(); + boolean columnAlignParameters = (args.size() > 1) && getOption(ConfigOption.COLUMN_ALIGN_PARAMETERS).isPresent(); if (columnAlignParameters) { printer.indentWithAlignTo(printer.getCursor().column); } @@ -186,8 +186,7 @@ protected void printArguments(final NodeList args, fin printer.print(")"); } - protected void printPrePostFixOptionalList( - final NodeList args, final Void arg, String prefix, String separator, String postfix) { + protected void printPrePostFixOptionalList(final NodeList args, final Void arg, String prefix, String separator, String postfix) { if (!args.isEmpty()) { printer.print(prefix); for (final Iterator i = args.iterator(); i.hasNext(); ) { @@ -201,8 +200,7 @@ protected void printPrePostFixOptionalList( } } - protected void printPrePostFixRequiredList( - final NodeList args, final Void arg, String prefix, String separator, String postfix) { + protected void printPrePostFixRequiredList(final NodeList args, final Void arg, String prefix, String separator, String postfix) { printer.print(prefix); if (!args.isEmpty()) { for (final Iterator i = args.iterator(); i.hasNext(); ) { @@ -221,7 +219,7 @@ protected void printComment(final Optional comment, final Void arg) { } @Override - public void visit(final CompilationUnit n, final Void arg) { + public void visit(final CompilationUnit n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getParsed() == UNPARSABLE) { @@ -244,7 +242,7 @@ public void visit(final CompilationUnit n, final Void arg) { } @Override - public void visit(final PackageDeclaration n, final Void arg) { + public void visit(final PackageDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -256,7 +254,7 @@ public void visit(final PackageDeclaration n, final Void arg) { } @Override - public void visit(final NameExpr n, final Void arg) { + public void visit(final NameExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -264,7 +262,7 @@ public void visit(final NameExpr n, final Void arg) { } @Override - public void visit(final Name n, final Void arg) { + public void visit(final Name n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getQualifier().isPresent()) { @@ -276,14 +274,14 @@ public void visit(final Name n, final Void arg) { } @Override - public void visit(SimpleName n, Void arg) { + public void visit(SimpleName n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getIdentifier()); } @Override - public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { + public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -307,9 +305,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { } if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -338,7 +334,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { } @Override - public void visit(RecordDeclaration n, Void arg) { + public void visit(RecordDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -359,9 +355,7 @@ public void visit(RecordDeclaration n, Void arg) { printer.print(")"); if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -380,14 +374,11 @@ public void visit(RecordDeclaration n, Void arg) { } @Override - public void visit(final JavadocComment n, final Void arg) { + public void visit(final JavadocComment n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); - if (getOption(ConfigOption.PRINT_COMMENTS).isPresent() - && getOption(ConfigOption.PRINT_JAVADOC).isPresent()) { + if (getOption(ConfigOption.PRINT_COMMENTS).isPresent() && getOption(ConfigOption.PRINT_JAVADOC).isPresent()) { printer.println(n.getHeader()); - final String commentContent = normalizeEolInTextBlock( - n.getContent(), - getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString()); + final String commentContent = normalizeEolInTextBlock(n.getContent(), getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString()); String[] lines = commentContent.split("\\R"); List strippedLines = new ArrayList<>(); for (String line : lines) { @@ -424,7 +415,7 @@ && getOption(ConfigOption.PRINT_JAVADOC).isPresent()) { } @Override - public void visit(final ClassOrInterfaceType n, final Void arg) { + public void visit(final ClassOrInterfaceType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getScope().isPresent()) { @@ -441,7 +432,7 @@ public void visit(final ClassOrInterfaceType n, final Void arg) { } @Override - public void visit(final TypeParameter n, final Void arg) { + public void visit(final TypeParameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -459,7 +450,7 @@ public void visit(final TypeParameter n, final Void arg) { } @Override - public void visit(final PrimitiveType n, final Void arg) { + public void visit(final PrimitiveType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), true, arg); @@ -467,7 +458,7 @@ public void visit(final PrimitiveType n, final Void arg) { } @Override - public void visit(final ArrayType n, final Void arg) { + public void visit(final ArrayType n, final Void arg) { final List arrayTypeBuffer = new LinkedList<>(); Type type = n; while (type instanceof ArrayType) { @@ -483,7 +474,7 @@ public void visit(final ArrayType n, final Void arg) { } @Override - public void visit(final ArrayCreationLevel n, final Void arg) { + public void visit(final ArrayCreationLevel n, final Void arg) { printAnnotations(n.getAnnotations(), true, arg); printer.print("["); if (n.getDimension().isPresent()) { @@ -493,7 +484,7 @@ public void visit(final ArrayCreationLevel n, final Void arg) { } @Override - public void visit(final IntersectionType n, final Void arg) { + public void visit(final IntersectionType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -509,7 +500,7 @@ public void visit(final IntersectionType n, final Void arg) { } @Override - public void visit(final UnionType n, final Void arg) { + public void visit(final UnionType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), true, arg); @@ -525,7 +516,7 @@ public void visit(final UnionType n, final Void arg) { } @Override - public void visit(final WildcardType n, final Void arg) { + public void visit(final WildcardType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -541,12 +532,12 @@ public void visit(final WildcardType n, final Void arg) { } @Override - public void visit(final UnknownType n, final Void arg) { + public void visit(final UnknownType n, final Void arg) { // Nothing to print } @Override - public void visit(final FieldDeclaration n, final Void arg) { + public void visit(final FieldDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -570,25 +561,23 @@ public void visit(final FieldDeclaration n, final Void arg) { } @Override - public void visit(final VariableDeclarator n, final Void arg) { + public void visit(final VariableDeclarator n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); - n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables) ancestor) - .getMaximumCommonType() - .ifPresent(commonType -> { - final Type type = n.getType(); - ArrayType arrayType = null; - for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) { - if (arrayType == null) { - arrayType = (ArrayType) type; - } else { - arrayType = (ArrayType) arrayType.getComponentType(); - } - printAnnotations(arrayType.getAnnotations(), true, arg); - printer.print("[]"); - } - })); + n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables) ancestor).getMaximumCommonType().ifPresent(commonType -> { + final Type type = n.getType(); + ArrayType arrayType = null; + for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) { + if (arrayType == null) { + arrayType = (ArrayType) type; + } else { + arrayType = (ArrayType) arrayType.getComponentType(); + } + printAnnotations(arrayType.getAnnotations(), true, arg); + printer.print("[]"); + } + })); if (n.getInitializer().isPresent()) { printer.print(" = "); n.getInitializer().get().accept(this, arg); @@ -596,7 +585,7 @@ public void visit(final VariableDeclarator n, final Void arg) { } @Override - public void visit(final ArrayInitializerExpr n, final Void arg) { + public void visit(final ArrayInitializerExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("{"); @@ -614,7 +603,8 @@ public void visit(final ArrayInitializerExpr n, final Void arg) { expr.accept(this, arg); if (i.hasNext()) { printer.print(multiLine ? "," : ", "); - if (multiLine) printer.println(); + if (multiLine) + printer.println(); } } if (multiLine) { @@ -630,12 +620,11 @@ public void visit(final ArrayInitializerExpr n, final Void arg) { } private boolean doPrintAsArrayOfAnnotations(final ArrayInitializerExpr n) { - return getOption(ConfigOption.INDENT_PRINT_ARRAYS_OF_ANNOTATIONS).isPresent() - && n.getValues().stream().allMatch(s -> s instanceof AnnotationExpr); + return getOption(ConfigOption.INDENT_PRINT_ARRAYS_OF_ANNOTATIONS).isPresent() && n.getValues().stream().allMatch(s -> s instanceof AnnotationExpr); } @Override - public void visit(final VoidType n, final Void arg) { + public void visit(final VoidType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -643,7 +632,7 @@ public void visit(final VoidType n, final Void arg) { } @Override - public void visit(final VarType n, final Void arg) { + public void visit(final VarType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -651,13 +640,13 @@ public void visit(final VarType n, final Void arg) { } @Override - public void visit(Modifier n, Void arg) { + public void visit(Modifier n, Void arg) { printer.print(n.getKeyword().asString()); printer.print(" "); } @Override - public void visit(final ArrayAccessExpr n, final Void arg) { + public void visit(final ArrayAccessExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -667,7 +656,7 @@ public void visit(final ArrayAccessExpr n, final Void arg) { } @Override - public void visit(final ArrayCreationExpr n, final Void arg) { + public void visit(final ArrayCreationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("new "); @@ -682,7 +671,7 @@ public void visit(final ArrayCreationExpr n, final Void arg) { } @Override - public void visit(final AssignExpr n, final Void arg) { + public void visit(final AssignExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getTarget().accept(this, arg); @@ -700,7 +689,7 @@ public void visit(final AssignExpr n, final Void arg) { * work in progress for issue-545 */ @Override - public void visit(final BinaryExpr n, final Void arg) { + public void visit(final BinaryExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getLeft().accept(this, arg); @@ -715,7 +704,7 @@ public void visit(final BinaryExpr n, final Void arg) { } @Override - public void visit(final CastExpr n, final Void arg) { + public void visit(final CastExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("("); @@ -725,7 +714,7 @@ public void visit(final CastExpr n, final Void arg) { } @Override - public void visit(final ClassExpr n, final Void arg) { + public void visit(final ClassExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getType().accept(this, arg); @@ -733,7 +722,7 @@ public void visit(final ClassExpr n, final Void arg) { } @Override - public void visit(final ConditionalExpr n, final Void arg) { + public void visit(final ConditionalExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getCondition().accept(this, arg); @@ -744,7 +733,7 @@ public void visit(final ConditionalExpr n, final Void arg) { } @Override - public void visit(final EnclosedExpr n, final Void arg) { + public void visit(final EnclosedExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("("); @@ -753,7 +742,7 @@ public void visit(final EnclosedExpr n, final Void arg) { } @Override - public void visit(final FieldAccessExpr n, final Void arg) { + public void visit(final FieldAccessExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getScope().accept(this, arg); @@ -762,7 +751,7 @@ public void visit(final FieldAccessExpr n, final Void arg) { } @Override - public void visit(final InstanceOfExpr n, final Void arg) { + public void visit(final InstanceOfExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getExpression().accept(this, arg); @@ -775,7 +764,7 @@ public void visit(final InstanceOfExpr n, final Void arg) { } @Override - public void visit(final TypePatternExpr n, final Void arg) { + public void visit(final TypePatternExpr n, final Void arg) { printModifiers(n.getModifiers()); n.getType().accept(this, arg); printer.print(" "); @@ -803,7 +792,7 @@ private void printList(NodeList args, String sep, String del } @Override - public void visit(JmlQuantifiedExpr n, Void arg) { + public void visit(JmlQuantifiedExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print("("); printer.print(n.getBinder().jmlSymbol()); @@ -815,7 +804,7 @@ public void visit(JmlQuantifiedExpr n, Void arg) { } @Override - public void visit(JmlClauseLabel n, Void arg) { + public void visit(JmlClauseLabel n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print(n.getKind().jmlSymbol); n.getLabel().ifPresent(it -> { @@ -842,7 +831,7 @@ private void printClause(JmlClauseKind name, Expression expr) { } @Override - public void visit(JmlExpressionStmt n, Void arg) { + public void visit(JmlExpressionStmt n, Void arg) { wrapInJmlIfNeeded(() -> { printer.print(n.getKind().jmlSymbol()); printer.print(" "); @@ -852,10 +841,10 @@ public void visit(JmlExpressionStmt n, Void arg) { } @Override - public void visit(JmlLabelExpr n, Void arg) { + public void visit(JmlLabelExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print("("); - switch (n.getKind()) { + switch(n.getKind()) { case NEUTRAL: printer.print("\\lbl"); break; @@ -873,7 +862,7 @@ public void visit(JmlLabelExpr n, Void arg) { } @Override - public void visit(JmlLetExpr n, Void arg) { + public void visit(JmlLetExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print("(\\let "); n.getVariables().accept(this, arg); @@ -883,7 +872,7 @@ public void visit(JmlLetExpr n, Void arg) { } @Override - public void visit(JmlMultiCompareExpr n, Void arg) { + public void visit(JmlMultiCompareExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); for (int i = 0; i < n.getOperators().size(); i++) { n.getExpressions().get(i).accept(this, arg); @@ -893,19 +882,19 @@ public void visit(JmlMultiCompareExpr n, Void arg) { } @Override - public void visit(JmlSimpleExprClause n, Void arg) { + public void visit(JmlSimpleExprClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printClause(n.getKind(), n.getHeaps().orElse(new NodeList<>()), n.getExpression()); } @Override - public void visit(JmlSignalsClause n, Void arg) { + public void visit(JmlSignalsClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printClause(n.getKind(), n.getExpression()); } @Override - public void visit(JmlSignalsOnlyClause n, Void arg) { + public void visit(JmlSignalsOnlyClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print(n.getKind().jmlSymbol); printer.print(" "); @@ -914,7 +903,7 @@ public void visit(JmlSignalsOnlyClause n, Void arg) { } @Override - public void visit(JmlUnreachableStmt n, Void arg) { + public void visit(JmlUnreachableStmt n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); wrapInJmlIfNeeded(() -> { printer.println("unreachable;"); @@ -933,7 +922,7 @@ void wrapInJmlIfNeeded(Runnable run) { } @Override - public void visit(JmlCallableClause n, Void arg) { + public void visit(JmlCallableClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print(n.getKind().jmlSymbol); printer.print(" TODO"); @@ -941,7 +930,7 @@ public void visit(JmlCallableClause n, Void arg) { } @Override - public void visit(JmlForallClause n, Void arg) { + public void visit(JmlForallClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print(n.getKind().jmlSymbol); printer.print(" "); @@ -950,7 +939,7 @@ public void visit(JmlForallClause n, Void arg) { } @Override - public void visit(JmlRefiningStmt n, Void arg) { + public void visit(JmlRefiningStmt n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); wrapInJmlIfNeeded(() -> { printer.print("refining"); @@ -959,13 +948,13 @@ public void visit(JmlRefiningStmt n, Void arg) { } @Override - public void visit(JmlClauseIf n, Void arg) { + public void visit(JmlClauseIf n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printClause(n.getKind(), new StringLiteralExpr((""))); } @Override - public void visit(JmlClassExprDeclaration n, Void arg) { + public void visit(JmlClassExprDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printModifiers(n.getModifiers()); printer.print("invariant "); @@ -974,7 +963,7 @@ public void visit(JmlClassExprDeclaration n, Void arg) { } @Override - public void visit(JmlClassAccessibleDeclaration n, Void arg) { + public void visit(JmlClassAccessibleDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printModifiers(n.getModifiers()); printer.print("accessible"); @@ -990,7 +979,7 @@ public void visit(JmlClassAccessibleDeclaration n, Void arg) { } @Override - public void visit(JmlRepresentsDeclaration n, Void arg) { + public void visit(JmlRepresentsDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printModifiers(n.getModifiers()); printer.print("represents"); @@ -1002,10 +991,11 @@ public void visit(JmlRepresentsDeclaration n, Void arg) { } @Override - public void visit(JmlContract n, Void arg) { + public void visit(JmlContract n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); boolean openedJml = inJmlComment(); - if (!openedJml) startJmlComment(false, n.getJmlTags()); + if (!openedJml) + startJmlComment(false, n.getJmlTags()); printModifiers(n.getModifiers()); printer.print(" "); printer.print(n.getBehavior().jmlSymbol()); @@ -1015,7 +1005,8 @@ public void visit(JmlContract n, Void arg) { printer.indent(); printList(n.getSubContracts(), "", "", "", "{|\n", "|}"); printer.unindent().unindent(); - if (!openedJml) endJmlComment(); + if (!openedJml) + endJmlComment(); } private void endJmlComment() { @@ -1042,7 +1033,7 @@ private void startJmlComment(boolean singleLine, NodeList jmlTags) { } @Override - public void visit(JmlSetComprehensionExpr n, Void arg) { + public void visit(JmlSetComprehensionExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("{ "); @@ -1054,7 +1045,7 @@ public void visit(JmlSetComprehensionExpr n, Void arg) { } @Override - public void visit(JmlGhostStmt n, Void arg) { + public void visit(JmlGhostStmt n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); wrapInJmlIfNeeded(() -> { printer.print("ghost"); @@ -1064,7 +1055,7 @@ public void visit(JmlGhostStmt n, Void arg) { } @Override - public void visit(JmlMethodDeclaration n, Void arg) { + public void visit(JmlMethodDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContract().ifPresent(c -> { c.accept(this, arg); @@ -1076,7 +1067,7 @@ public void visit(JmlMethodDeclaration n, Void arg) { } @Override - public void visit(JmlBinaryInfixExpr n, Void arg) { + public void visit(JmlBinaryInfixExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print("("); n.getLeft().accept(this, arg); @@ -1088,34 +1079,34 @@ public void visit(JmlBinaryInfixExpr n, Void arg) { } @Override - public void visit(JmlDocDeclaration n, Void arg) { + public void visit(JmlDocDeclaration n, Void arg) { n.getJmlComments().forEach(it -> it.accept(this, arg)); } @Override - public void visit(JmlDocStmt n, Void arg) { + public void visit(JmlDocStmt n, Void arg) { n.getJmlComments().forEach(it -> it.accept(this, arg)); } @Override - public void visit(JmlDoc n, Void arg) { + public void visit(JmlDoc n, Void arg) { printer.print(n.getContent().asString()); } @Override - public void visit(JmlDocType n, Void arg) { + public void visit(JmlDocType n, Void arg) { n.getJmlComments().accept(this, arg); } @Override - public void visit(JmlFieldDeclaration n, Void arg) { + public void visit(JmlFieldDeclaration n, Void arg) { startJmlComment(false, new NodeList<>()); n.getDecl().accept(this, null); endJmlComment(); } @Override - public void visit(JmlOldClause n, Void arg) { + public void visit(JmlOldClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print(n.getKind().jmlSymbol); printer.print(" "); @@ -1124,12 +1115,12 @@ public void visit(JmlOldClause n, Void arg) { } @Override - public void visit(JmlTypeExpr n, Void arg) { + public void visit(JmlTypeExpr n, Void arg) { n.getType().accept(this, arg); } @Override - public void visit(JmlMultiExprClause n, Void arg) { + public void visit(JmlMultiExprClause n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getKind().jmlSymbol()); @@ -1147,21 +1138,21 @@ public void visit(JmlMultiExprClause n, Void arg) { } @Override - public void visit(JmlBeginStmt n, Void arg) { + public void visit(JmlBeginStmt n, Void arg) { startJmlComment(true, new NodeList<>()); printer.print("begin"); endJmlComment(); } @Override - public void visit(JmlEndStmt n, Void arg) { + public void visit(JmlEndStmt n, Void arg) { startJmlComment(true, new NodeList<>()); printer.print("end"); endJmlComment(); } @Override - public void visit(JmlLabelStmt n, Void arg) { + public void visit(JmlLabelStmt n, Void arg) { startJmlComment(true, new NodeList<>()); n.getLabel().accept(this, arg); printer.print(":"); @@ -1169,7 +1160,7 @@ public void visit(JmlLabelStmt n, Void arg) { } @Override - public void visit(JmlMethodSignature n, Void arg) { + public void visit(JmlMethodSignature n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getReceiver().ifPresent(it -> { @@ -1183,7 +1174,7 @@ public void visit(JmlMethodSignature n, Void arg) { } @Override - public void visit(final RecordPatternExpr n, final Void arg) { + public void visit(final RecordPatternExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getType().accept(this, arg); @@ -1191,7 +1182,7 @@ public void visit(final RecordPatternExpr n, final Void arg) { } @Override - public void visit(final CharLiteralExpr n, final Void arg) { + public void visit(final CharLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("'"); @@ -1200,28 +1191,28 @@ public void visit(final CharLiteralExpr n, final Void arg) { } @Override - public void visit(final DoubleLiteralExpr n, final Void arg) { + public void visit(final DoubleLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final IntegerLiteralExpr n, final Void arg) { + public void visit(final IntegerLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final LongLiteralExpr n, final Void arg) { + public void visit(final LongLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final StringLiteralExpr n, final Void arg) { + public void visit(final StringLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("\""); @@ -1230,7 +1221,7 @@ public void visit(final StringLiteralExpr n, final Void arg) { } @Override - public void visit(final TextBlockLiteralExpr n, final Void arg) { + public void visit(final TextBlockLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("\"\"\""); @@ -1244,21 +1235,21 @@ public void visit(final TextBlockLiteralExpr n, final Void arg) { } @Override - public void visit(final BooleanLiteralExpr n, final Void arg) { + public void visit(final BooleanLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(String.valueOf(n.getValue())); } @Override - public void visit(final NullLiteralExpr n, final Void arg) { + public void visit(final NullLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("null"); } @Override - public void visit(final ThisExpr n, final Void arg) { + public void visit(final ThisExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getTypeName().isPresent()) { @@ -1269,7 +1260,7 @@ public void visit(final ThisExpr n, final Void arg) { } @Override - public void visit(final SuperExpr n, final Void arg) { + public void visit(final SuperExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getTypeName().isPresent()) { @@ -1280,7 +1271,7 @@ public void visit(final SuperExpr n, final Void arg) { } @Override - public void visit(final MethodCallExpr n, final Void arg) { + public void visit(final MethodCallExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); // determine whether we do reindenting for aligmnent at all @@ -1290,24 +1281,16 @@ public void visit(final MethodCallExpr n, final Void arg) { AtomicBoolean columnAlignFirstMethodChain = new AtomicBoolean(); if (getOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN).isPresent()) { // pick the kind of expressions where vertically aligning method calls is okay. - if (n.findAncestor(Statement.class) - .map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()) - .orElse(false)) { + if (n.findAncestor(Statement.class).map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()).orElse(false)) { // search for first parent that does not have its child as scope Node c = n; Optional p = c.getParentNode(); - while (p.isPresent() - && p.filter(NodeWithTraversableScope.class::isInstance) - .map(NodeWithTraversableScope.class::cast) - .flatMap(NodeWithTraversableScope::traverseScope) - .map(c::equals) - .orElse(false)) { + while (p.isPresent() && p.filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(c::equals).orElse(false)) { c = p.get(); p = c.getParentNode(); } // check if the parent is a method call and thus we are in an argument list - columnAlignFirstMethodChain.set( - !p.filter(MethodCallExpr.class::isInstance).isPresent()); + columnAlignFirstMethodChain.set(!p.filter(MethodCallExpr.class::isInstance).isPresent()); } } // we are at the last method call of a call chain @@ -1315,12 +1298,7 @@ public void visit(final MethodCallExpr n, final Void arg) { AtomicBoolean lastMethodInCallChain = new AtomicBoolean(true); if (columnAlignFirstMethodChain.get()) { Node node = n; - while (node.getParentNode() - .filter(NodeWithTraversableScope.class::isInstance) - .map(NodeWithTraversableScope.class::cast) - .flatMap(NodeWithTraversableScope::traverseScope) - .map(node::equals) - .orElse(false)) { + while (node.getParentNode().filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(node::equals).orElse(false)) { node = node.getParentNode().orElseThrow(AssertionError::new); if (node instanceof MethodCallExpr) { lastMethodInCallChain.set(false); @@ -1334,8 +1312,7 @@ public void visit(final MethodCallExpr n, final Void arg) { if (columnAlignFirstMethodChain.get()) { Optional s = n.getScope(); while (s.filter(NodeWithTraversableScope.class::isInstance).isPresent()) { - Optional parentScope = - s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope); + Optional parentScope = s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope); if (s.filter(MethodCallExpr.class::isInstance).isPresent() && parentScope.isPresent()) { methodCallWithScopeInScope.set(true); break; @@ -1379,7 +1356,7 @@ public void visit(final MethodCallExpr n, final Void arg) { } @Override - public void visit(final ObjectCreationExpr n, final Void arg) { + public void visit(final ObjectCreationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.hasScope()) { @@ -1403,7 +1380,7 @@ public void visit(final ObjectCreationExpr n, final Void arg) { } @Override - public void visit(final UnaryExpr n, final Void arg) { + public void visit(final UnaryExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getOperator().isPrefix()) { @@ -1416,7 +1393,7 @@ public void visit(final UnaryExpr n, final Void arg) { } @Override - public void visit(final ConstructorDeclaration n, final Void arg) { + public void visit(final ConstructorDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1458,7 +1435,7 @@ public void visit(final ConstructorDeclaration n, final Void arg) { } @Override - public void visit(final CompactConstructorDeclaration n, final Void arg) { + public void visit(final CompactConstructorDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1483,7 +1460,7 @@ public void visit(final CompactConstructorDeclaration n, final Void arg) { } @Override - public void visit(final MethodDeclaration n, final Void arg) { + public void visit(final MethodDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printList(n.getContracts(), "\n"); @@ -1532,7 +1509,7 @@ public void visit(final MethodDeclaration n, final Void arg) { } @Override - public void visit(final Parameter n, final Void arg) { + public void visit(final Parameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -1549,7 +1526,7 @@ public void visit(final Parameter n, final Void arg) { } @Override - public void visit(final ReceiverParameter n, final Void arg) { + public void visit(final ReceiverParameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -1559,7 +1536,7 @@ public void visit(final ReceiverParameter n, final Void arg) { } @Override - public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { + public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.isThis()) { @@ -1578,7 +1555,7 @@ public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { } @Override - public void visit(final VariableDeclarationExpr n, final Void arg) { + public void visit(final VariableDeclarationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getParentNode().map(ExpressionStmt.class::isInstance).orElse(false)) { @@ -1601,21 +1578,21 @@ public void visit(final VariableDeclarationExpr n, final Void arg) { } @Override - public void visit(final LocalClassDeclarationStmt n, final Void arg) { + public void visit(final LocalClassDeclarationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getClassDeclaration().accept(this, arg); } @Override - public void visit(final LocalRecordDeclarationStmt n, final Void arg) { + public void visit(final LocalRecordDeclarationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getRecordDeclaration().accept(this, arg); } @Override - public void visit(final AssertStmt n, final Void arg) { + public void visit(final AssertStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("assert "); @@ -1628,7 +1605,7 @@ public void visit(final AssertStmt n, final Void arg) { } @Override - public void visit(final BlockStmt n, final Void arg) { + public void visit(final BlockStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContracts().accept(this, arg); printComment(n.getComment(), arg); @@ -1646,7 +1623,7 @@ public void visit(final BlockStmt n, final Void arg) { } @Override - public void visit(final LabeledStmt n, final Void arg) { + public void visit(final LabeledStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getLabel().accept(this, arg); @@ -1655,14 +1632,14 @@ public void visit(final LabeledStmt n, final Void arg) { } @Override - public void visit(final EmptyStmt n, final Void arg) { + public void visit(final EmptyStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(";"); } @Override - public void visit(final ExpressionStmt n, final Void arg) { + public void visit(final ExpressionStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getExpression().accept(this, arg); @@ -1670,13 +1647,13 @@ public void visit(final ExpressionStmt n, final Void arg) { } @Override - public void visit(final SwitchStmt n, final Void arg) { + public void visit(final SwitchStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printSwitchNode(n, arg); } @Override - public void visit(SwitchExpr n, Void arg) { + public void visit(SwitchExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printSwitchNode(n, arg); } @@ -1697,7 +1674,7 @@ private void printSwitchNode(SwitchNode n, Void arg) { } @Override - public void visit(final SwitchEntry n, final Void arg) { + public void visit(final SwitchEntry n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); // old/new switch @@ -1735,7 +1712,7 @@ public void visit(final SwitchEntry n, final Void arg) { } @Override - public void visit(final BreakStmt n, final Void arg) { + public void visit(final BreakStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("break"); @@ -1744,7 +1721,7 @@ public void visit(final BreakStmt n, final Void arg) { } @Override - public void visit(final YieldStmt n, final Void arg) { + public void visit(final YieldStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("yield "); @@ -1753,7 +1730,7 @@ public void visit(final YieldStmt n, final Void arg) { } @Override - public void visit(final ReturnStmt n, final Void arg) { + public void visit(final ReturnStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("return"); @@ -1765,7 +1742,7 @@ public void visit(final ReturnStmt n, final Void arg) { } @Override - public void visit(final EnumDeclaration n, final Void arg) { + public void visit(final EnumDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1774,9 +1751,7 @@ public void visit(final EnumDeclaration n, final Void arg) { n.getName().accept(this, arg); if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -1788,11 +1763,7 @@ public void visit(final EnumDeclaration n, final Void arg) { printer.indent(); if (n.getEntries().isNonEmpty()) { // Either we hit the constant amount limit in the configurations, or any of the constants has a comment - final boolean alignVertically = n.getEntries().size() - > getOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY) - .get() - .asInteger() - || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent()); + final boolean alignVertically = n.getEntries().size() > getOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY).get().asInteger() || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent()); printer.println(); for (final Iterator i = n.getEntries().iterator(); i.hasNext(); ) { final EnumConstantDeclaration e = i.next(); @@ -1819,7 +1790,7 @@ > getOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY) } @Override - public void visit(final EnumConstantDeclaration n, final Void arg) { + public void visit(final EnumConstantDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1837,7 +1808,7 @@ public void visit(final EnumConstantDeclaration n, final Void arg) { } @Override - public void visit(final InitializerDeclaration n, final Void arg) { + public void visit(final InitializerDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.isStatic()) { @@ -1847,38 +1818,45 @@ public void visit(final InitializerDeclaration n, final Void arg) { } @Override - public void visit(final IfStmt n, final Void arg) { + public void visit(final IfStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("if ("); n.getCondition().accept(this, arg); final boolean thenBlock = n.getThenStmt() instanceof BlockStmt; - if ( // block statement should start on the same line - thenBlock) printer.print(") "); + if (// block statement should start on the same line + thenBlock) + printer.print(") "); else { printer.println(")"); printer.indent(); } n.getThenStmt().accept(this, arg); - if (!thenBlock) printer.unindent(); + if (!thenBlock) + printer.unindent(); if (n.getElseStmt().isPresent()) { - if (thenBlock) printer.print(" "); - else printer.println(); + if (thenBlock) + printer.print(" "); + else + printer.println(); final boolean elseIf = n.getElseStmt().orElse(null) instanceof IfStmt; final boolean elseBlock = n.getElseStmt().orElse(null) instanceof BlockStmt; - if ( // put chained if and start of block statement on a same level - elseIf || elseBlock) printer.print("else "); + if (// put chained if and start of block statement on a same level + elseIf || elseBlock) + printer.print("else "); else { printer.println("else"); printer.indent(); } - if (n.getElseStmt().isPresent()) n.getElseStmt().get().accept(this, arg); - if (!(elseIf || elseBlock)) printer.unindent(); + if (n.getElseStmt().isPresent()) + n.getElseStmt().get().accept(this, arg); + if (!(elseIf || elseBlock)) + printer.unindent(); } } @Override - public void visit(final WhileStmt n, final Void arg) { + public void visit(final WhileStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContracts().accept(this, arg); printComment(n.getComment(), arg); @@ -1889,7 +1867,7 @@ public void visit(final WhileStmt n, final Void arg) { } @Override - public void visit(final ContinueStmt n, final Void arg) { + public void visit(final ContinueStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("continue"); @@ -1898,7 +1876,7 @@ public void visit(final ContinueStmt n, final Void arg) { } @Override - public void visit(final DoStmt n, final Void arg) { + public void visit(final DoStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContracts().accept(this, arg); printComment(n.getComment(), arg); @@ -1910,7 +1888,7 @@ public void visit(final DoStmt n, final Void arg) { } @Override - public void visit(final ForEachStmt n, final Void arg) { + public void visit(final ForEachStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContracts().accept(this, arg); printComment(n.getComment(), arg); @@ -1923,7 +1901,7 @@ public void visit(final ForEachStmt n, final Void arg) { } @Override - public void visit(final ForStmt n, final Void arg) { + public void visit(final ForStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); n.getContracts().accept(this, arg); printComment(n.getComment(), arg); @@ -1956,7 +1934,7 @@ public void visit(final ForStmt n, final Void arg) { } @Override - public void visit(final ThrowStmt n, final Void arg) { + public void visit(final ThrowStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("throw "); @@ -1965,7 +1943,7 @@ public void visit(final ThrowStmt n, final Void arg) { } @Override - public void visit(final SynchronizedStmt n, final Void arg) { + public void visit(final SynchronizedStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("synchronized ("); @@ -1975,7 +1953,7 @@ public void visit(final SynchronizedStmt n, final Void arg) { } @Override - public void visit(final TryStmt n, final Void arg) { + public void visit(final TryStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("try "); @@ -2010,7 +1988,7 @@ public void visit(final TryStmt n, final Void arg) { } @Override - public void visit(final CatchClause n, final Void arg) { + public void visit(final CatchClause n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(" catch ("); @@ -2020,7 +1998,7 @@ public void visit(final CatchClause n, final Void arg) { } @Override - public void visit(final AnnotationDeclaration n, final Void arg) { + public void visit(final AnnotationDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -2037,7 +2015,7 @@ public void visit(final AnnotationDeclaration n, final Void arg) { } @Override - public void visit(final AnnotationMemberDeclaration n, final Void arg) { + public void visit(final AnnotationMemberDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -2054,7 +2032,7 @@ public void visit(final AnnotationMemberDeclaration n, final Void arg) { } @Override - public void visit(final MarkerAnnotationExpr n, final Void arg) { + public void visit(final MarkerAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -2062,7 +2040,7 @@ public void visit(final MarkerAnnotationExpr n, final Void arg) { } @Override - public void visit(final SingleMemberAnnotationExpr n, final Void arg) { + public void visit(final SingleMemberAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -2073,7 +2051,7 @@ public void visit(final SingleMemberAnnotationExpr n, final Void arg) { } @Override - public void visit(final NormalAnnotationExpr n, final Void arg) { + public void visit(final NormalAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -2092,7 +2070,7 @@ public void visit(final NormalAnnotationExpr n, final Void arg) { } @Override - public void visit(final MemberValuePair n, final Void arg) { + public void visit(final MemberValuePair n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -2101,22 +2079,19 @@ public void visit(final MemberValuePair n, final Void arg) { } @Override - public void visit(final LineComment n, final Void arg) { + public void visit(final LineComment n, final Void arg) { if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) { return; } - printer.print(n.getHeader()) - .println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), "")); + printer.print(n.getHeader()).println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), "")); } @Override - public void visit(final BlockComment n, final Void arg) { + public void visit(final BlockComment n, final Void arg) { if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) { return; } - final String commentContent = normalizeEolInTextBlock( - n.getContent(), - getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString()); + final String commentContent = normalizeEolInTextBlock(n.getContent(), getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString()); // as BlockComment should not be formatted, -1 to preserve any trailing empty line if present String[] lines = commentContent.split("\\R", -1); printer.print(n.getHeader()); @@ -2132,7 +2107,7 @@ public void visit(final BlockComment n, final Void arg) { } @Override - public void visit(LambdaExpr n, Void arg) { + public void visit(LambdaExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); final NodeList parameters = n.getParameters(); @@ -2161,7 +2136,7 @@ public void visit(LambdaExpr n, Void arg) { } @Override - public void visit(MethodReferenceExpr n, Void arg) { + public void visit(MethodReferenceExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); Expression scope = n.getScope(); @@ -2177,7 +2152,7 @@ public void visit(MethodReferenceExpr n, Void arg) { } @Override - public void visit(TypeExpr n, Void arg) { + public void visit(TypeExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getType() != null) { @@ -2186,14 +2161,14 @@ public void visit(TypeExpr n, Void arg) { } @Override - public void visit(NodeList n, Void arg) { + public void visit(NodeList n, Void arg) { for (Object node : n) { ((Node) node).accept(this, arg); } } @Override - public void visit(final ImportDeclaration n, final Void arg) { + public void visit(final ImportDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.isJmlModel()) { @@ -2216,7 +2191,7 @@ public void visit(final ImportDeclaration n, final Void arg) { } @Override - public void visit(ModuleDeclaration n, Void arg) { + public void visit(ModuleDeclaration n, Void arg) { printMemberAnnotations(n.getAnnotations(), arg); if (n.isOpen()) { printer.print("open "); @@ -2229,7 +2204,7 @@ public void visit(ModuleDeclaration n, Void arg) { } @Override - public void visit(ModuleRequiresDirective n, Void arg) { + public void visit(ModuleRequiresDirective n, Void arg) { printer.print("requires "); printModifiers(n.getModifiers()); n.getName().accept(this, arg); @@ -2237,7 +2212,7 @@ public void visit(ModuleRequiresDirective n, Void arg) { } @Override - public void visit(ModuleExportsDirective n, Void arg) { + public void visit(ModuleExportsDirective n, Void arg) { printer.print("exports "); n.getName().accept(this, arg); printPrePostFixOptionalList(n.getModuleNames(), arg, " to ", ", ", ""); @@ -2245,7 +2220,7 @@ public void visit(ModuleExportsDirective n, Void arg) { } @Override - public void visit(ModuleProvidesDirective n, Void arg) { + public void visit(ModuleProvidesDirective n, Void arg) { printer.print("provides "); n.getName().accept(this, arg); printPrePostFixRequiredList(n.getWith(), arg, " with ", ", ", ""); @@ -2253,14 +2228,14 @@ public void visit(ModuleProvidesDirective n, Void arg) { } @Override - public void visit(ModuleUsesDirective n, Void arg) { + public void visit(ModuleUsesDirective n, Void arg) { printer.print("uses "); n.getName().accept(this, arg); printer.println(";"); } @Override - public void visit(ModuleOpensDirective n, Void arg) { + public void visit(ModuleOpensDirective n, Void arg) { printer.print("opens "); n.getName().accept(this, arg); printPrePostFixOptionalList(n.getModuleNames(), arg, " to ", ", ", ""); @@ -2268,7 +2243,7 @@ public void visit(ModuleOpensDirective n, Void arg) { } @Override - public void visit(UnparsableStmt n, Void arg) { + public void visit(UnparsableStmt n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printer.print("???;"); } @@ -2314,10 +2289,13 @@ private void printClause(JmlClauseKind name, NodeList heaps, NodeLis } private void printOrphanCommentsBeforeThisChildNode(final Node node) { - if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) return; - if (node instanceof Comment) return; + if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) + return; + if (node instanceof Comment) + return; Node parent = node.getParentNode().orElse(null); - if (parent == null) return; + if (parent == null) + return; List everything = new ArrayList<>(parent.getChildNodes()); sortByBeginPosition(everything); int positionOfTheChild = -1; @@ -2333,20 +2311,20 @@ private void printOrphanCommentsBeforeThisChildNode(final Node node) { } int positionOfPreviousChild = -1; for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) { - if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i; + if (!(everything.get(i) instanceof Comment)) + positionOfPreviousChild = i; } for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) { Node nodeToPrint = everything.get(i); if (!(nodeToPrint instanceof Comment)) - throw new RuntimeException( - "Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " - + positionOfPreviousChild + ", position of child " + positionOfTheChild); + throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild); nodeToPrint.accept(this, null); } } private void printOrphanCommentsEnding(final Node node) { - if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) return; + if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) + return; List everything = new ArrayList<>(node.getChildNodes()); sortByBeginPosition(everything); if (everything.isEmpty()) { @@ -2367,11 +2345,13 @@ private void printOrphanCommentsEnding(final Node node) { } private void indentIf(boolean expr) { - if (expr) printer.indent(); + if (expr) + printer.indent(); } private void unindentIf(boolean expr) { - if (expr) printer.unindent(); + if (expr) + printer.unindent(); } private Optional getOption(ConfigOption cOption) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java index da446f1a7b..76a2bbd369 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java @@ -24,27 +24,25 @@ import com.github.javaparser.ast.NodeList; import com.github.javaparser.metamodel.NodeMetaModel; import com.github.javaparser.metamodel.PropertyMetaModel; - +import com.github.javaparser.utils.LineSeparator; import java.util.List; - -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.toList; /** * Outputs a Graphviz diagram of the AST. */ -public class DotPrinter { +public class DotPrinter { private int nodeCount; private final boolean outputNodeType; - public DotPrinter(boolean outputNodeType) { + public DotPrinter(boolean outputNodeType) { this.outputNodeType = outputNodeType; } - public String output(Node node) { + public String output(Node node) { nodeCount = 0; StringBuilder output = new StringBuilder(); output.append("digraph {"); @@ -53,36 +51,29 @@ public String output(Node node) { return output.toString(); } - public void output(Node node, String parentNodeName, String name, StringBuilder builder) { + public void output(Node node, String parentNodeName, String name, StringBuilder builder) { assertNotNull(node); NodeMetaModel metaModel = node.getMetaModel(); List allPropertyMetaModels = metaModel.getAllPropertyMetaModels(); - List attributes = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isAttribute) - .filter(PropertyMetaModel::isSingular) - .collect(toList()); - List subNodes = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isNode) - .filter(PropertyMetaModel::isSingular) - .collect(toList()); - List subLists = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isNodeList) - .collect(toList()); + List attributes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).collect(toList()); + List subNodes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNode).filter(PropertyMetaModel::isSingular).collect(toList()); + List subLists = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNodeList).collect(toList()); String ndName = nextNodeName(); if (outputNodeType) - builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + " (" + metaModel.getTypeName() - + ")\"];"); - else builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + "\"];"); - if (parentNodeName != null) builder.append(LineSeparator.SYSTEM + parentNodeName + " -> " + ndName + ";"); + builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + " (" + metaModel.getTypeName() + ")\"];"); + else + builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + "\"];"); + if (parentNodeName != null) + builder.append(LineSeparator.SYSTEM + parentNodeName + " -> " + ndName + ";"); for (PropertyMetaModel a : attributes) { String attrName = nextNodeName(); - builder.append(LineSeparator.SYSTEM + attrName + " [label=\"" + escape(a.getName()) + "='" - + escape(a.getValue(node).toString()) + "'\"];"); + builder.append(LineSeparator.SYSTEM + attrName + " [label=\"" + escape(a.getName()) + "='" + escape(a.getValue(node).toString()) + "'\"];"); builder.append(LineSeparator.SYSTEM + ndName + " -> " + attrName + ";"); } for (PropertyMetaModel sn : subNodes) { Node nd = (Node) sn.getValue(node); - if (nd != null) output(nd, ndName, sn.getName(), builder); + if (nd != null) + output(nd, ndName, sn.getName(), builder); } for (PropertyMetaModel sl : subLists) { NodeList nl = (NodeList) sl.getValue(node); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java index a304964398..14dc8a6e3c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java @@ -25,12 +25,10 @@ import static com.github.javaparser.utils.Utils.*; import static java.util.Comparator.comparingInt; import static java.util.stream.Collectors.joining; - import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; import java.util.stream.Collectors; - import com.github.javaparser.ast.*; import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.comments.BlockComment; @@ -45,6 +43,11 @@ import com.github.javaparser.ast.visitor.Visitable; import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.printer.configuration.PrettyPrinterConfiguration; +import com.github.javaparser.ast.jml.clauses.*; +import com.github.javaparser.ast.jml.doc.*; +import com.github.javaparser.ast.jml.stmt.*; +import com.github.javaparser.ast.jml.body.*; +import com.github.javaparser.ast.jml.expr.*; /** * Outputs the AST as formatted Java source code. @@ -53,10 +56,10 @@ * * @author Julio Vilmar Gesser * @deprecated This class is no longer acceptable to use because it is not sufficiently configurable and it is too tied to a specific implementation. - * This class could be removed in a future version. Use default DefaultPrettyPrinterVisitor. + * This class could be removed in a future version. Use defaultPrettyPrinterVisitor. */ @Deprecated -public class PrettyPrintVisitor implements VoidVisitor { +public class PrettyPrintVisitor implements VoidVisitor { private static Pattern RTRIM = Pattern.compile("\\s+$"); @@ -64,12 +67,12 @@ public class PrettyPrintVisitor implements VoidVisitor { protected final SourcePrinter printer; - public PrettyPrintVisitor(PrettyPrinterConfiguration prettyPrinterConfiguration) { + public PrettyPrintVisitor(PrettyPrinterConfiguration prettyPrinterConfiguration) { this.configuration = prettyPrinterConfiguration; printer = new SourcePrinter(configuration); } - public void setConfiguration(PrettyPrinterConfiguration prettyPrinterConfiguration) { + public void setConfiguration(PrettyPrinterConfiguration prettyPrinterConfiguration) { this.configuration = prettyPrinterConfiguration; } @@ -77,22 +80,18 @@ public void setConfiguration(PrettyPrinterConfiguration prettyPrinterConfigurati * @deprecated use toString() */ @Deprecated - public String getSource() { + public String getSource() { return printer.toString(); } @Override - public String toString() { + public String toString() { return printer.toString(); } protected void printModifiers(final NodeList modifiers) { if (modifiers.size() > 0) { - printer.print( - modifiers.stream() - .map(Modifier::getKeyword) - .map(Modifier.Keyword::asString) - .collect(joining(" ")) + " "); + printer.print(modifiers.stream().map(Modifier::getKeyword).map(Modifier.Keyword::asString).collect(joining(" ")) + " "); } } @@ -114,8 +113,7 @@ protected void printMemberAnnotations(final NodeList annotations } } - protected void printAnnotations( - final NodeList annotations, boolean prefixWithASpace, final Void arg) { + protected void printAnnotations(final NodeList annotations, boolean prefixWithASpace, final Void arg) { if (annotations.isEmpty()) { return; } @@ -183,8 +181,7 @@ protected void printArguments(final NodeList args, fin printer.print(")"); } - protected void printPrePostFixOptionalList( - final NodeList args, final Void arg, String prefix, String separator, String postfix) { + protected void printPrePostFixOptionalList(final NodeList args, final Void arg, String prefix, String separator, String postfix) { if (!args.isEmpty()) { printer.print(prefix); for (final Iterator i = args.iterator(); i.hasNext(); ) { @@ -198,8 +195,7 @@ protected void printPrePostFixOptionalList( } } - protected void printPrePostFixRequiredList( - final NodeList args, final Void arg, String prefix, String separator, String postfix) { + protected void printPrePostFixRequiredList(final NodeList args, final Void arg, String prefix, String separator, String postfix) { printer.print(prefix); if (!args.isEmpty()) { for (final Iterator i = args.iterator(); i.hasNext(); ) { @@ -218,7 +214,7 @@ protected void printComment(final Optional comment, final Void arg) { } @Override - public void visit(final CompilationUnit n, final Void arg) { + public void visit(final CompilationUnit n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getParsed() == UNPARSABLE) { @@ -244,7 +240,7 @@ public void visit(final CompilationUnit n, final Void arg) { } @Override - public void visit(final PackageDeclaration n, final Void arg) { + public void visit(final PackageDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -256,7 +252,7 @@ public void visit(final PackageDeclaration n, final Void arg) { } @Override - public void visit(final NameExpr n, final Void arg) { + public void visit(final NameExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -264,7 +260,7 @@ public void visit(final NameExpr n, final Void arg) { } @Override - public void visit(final Name n, final Void arg) { + public void visit(final Name n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getQualifier().isPresent()) { @@ -276,12 +272,12 @@ public void visit(final Name n, final Void arg) { } @Override - public void visit(SimpleName n, Void arg) { + public void visit(SimpleName n, Void arg) { printer.print(n.getIdentifier()); } @Override - public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { + public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -305,9 +301,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { } if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -336,7 +330,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) { } @Override - public void visit(RecordDeclaration n, Void arg) { + public void visit(RecordDeclaration n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -357,9 +351,7 @@ public void visit(RecordDeclaration n, Void arg) { printTypeParameters(n.getTypeParameters(), arg); if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -378,12 +370,11 @@ public void visit(RecordDeclaration n, Void arg) { } @Override - public void visit(final JavadocComment n, final Void arg) { + public void visit(final JavadocComment n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); if (configuration.isPrintComments() && configuration.isPrintJavadoc()) { printer.println(n.getHeader()); - final String commentContent = - normalizeEolInTextBlock(n.getContent(), configuration.getEndOfLineCharacter()); + final String commentContent = normalizeEolInTextBlock(n.getContent(), configuration.getEndOfLineCharacter()); String[] lines = commentContent.split("\\R"); List strippedLines = new ArrayList<>(); for (String line : lines) { @@ -420,7 +411,7 @@ public void visit(final JavadocComment n, final Void arg) { } @Override - public void visit(final ClassOrInterfaceType n, final Void arg) { + public void visit(final ClassOrInterfaceType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getScope().isPresent()) { @@ -437,7 +428,7 @@ public void visit(final ClassOrInterfaceType n, final Void arg) { } @Override - public void visit(final TypeParameter n, final Void arg) { + public void visit(final TypeParameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -455,7 +446,7 @@ public void visit(final TypeParameter n, final Void arg) { } @Override - public void visit(final PrimitiveType n, final Void arg) { + public void visit(final PrimitiveType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), true, arg); @@ -463,7 +454,7 @@ public void visit(final PrimitiveType n, final Void arg) { } @Override - public void visit(final ArrayType n, final Void arg) { + public void visit(final ArrayType n, final Void arg) { final List arrayTypeBuffer = new LinkedList<>(); Type type = n; while (type instanceof ArrayType) { @@ -479,7 +470,7 @@ public void visit(final ArrayType n, final Void arg) { } @Override - public void visit(final ArrayCreationLevel n, final Void arg) { + public void visit(final ArrayCreationLevel n, final Void arg) { printAnnotations(n.getAnnotations(), true, arg); printer.print("["); if (n.getDimension().isPresent()) { @@ -489,7 +480,7 @@ public void visit(final ArrayCreationLevel n, final Void arg) { } @Override - public void visit(final IntersectionType n, final Void arg) { + public void visit(final IntersectionType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -505,7 +496,7 @@ public void visit(final IntersectionType n, final Void arg) { } @Override - public void visit(final UnionType n, final Void arg) { + public void visit(final UnionType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), true, arg); @@ -521,7 +512,7 @@ public void visit(final UnionType n, final Void arg) { } @Override - public void visit(final WildcardType n, final Void arg) { + public void visit(final WildcardType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -537,12 +528,12 @@ public void visit(final WildcardType n, final Void arg) { } @Override - public void visit(final UnknownType n, final Void arg) { + public void visit(final UnknownType n, final Void arg) { // Nothing to print } @Override - public void visit(final FieldDeclaration n, final Void arg) { + public void visit(final FieldDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -566,25 +557,23 @@ public void visit(final FieldDeclaration n, final Void arg) { } @Override - public void visit(final VariableDeclarator n, final Void arg) { + public void visit(final VariableDeclarator n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); - n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables) ancestor) - .getMaximumCommonType() - .ifPresent(commonType -> { - final Type type = n.getType(); - ArrayType arrayType = null; - for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) { - if (arrayType == null) { - arrayType = (ArrayType) type; - } else { - arrayType = (ArrayType) arrayType.getComponentType(); - } - printAnnotations(arrayType.getAnnotations(), true, arg); - printer.print("[]"); - } - })); + n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables) ancestor).getMaximumCommonType().ifPresent(commonType -> { + final Type type = n.getType(); + ArrayType arrayType = null; + for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) { + if (arrayType == null) { + arrayType = (ArrayType) type; + } else { + arrayType = (ArrayType) arrayType.getComponentType(); + } + printAnnotations(arrayType.getAnnotations(), true, arg); + printer.print("[]"); + } + })); if (n.getInitializer().isPresent()) { printer.print(" = "); n.getInitializer().get().accept(this, arg); @@ -592,7 +581,7 @@ public void visit(final VariableDeclarator n, final Void arg) { } @Override - public void visit(final ArrayInitializerExpr n, final Void arg) { + public void visit(final ArrayInitializerExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("{"); @@ -612,7 +601,7 @@ public void visit(final ArrayInitializerExpr n, final Void arg) { } @Override - public void visit(final VoidType n, final Void arg) { + public void visit(final VoidType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -620,7 +609,7 @@ public void visit(final VoidType n, final Void arg) { } @Override - public void visit(final VarType n, final Void arg) { + public void visit(final VarType n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -628,13 +617,13 @@ public void visit(final VarType n, final Void arg) { } @Override - public void visit(Modifier n, Void arg) { + public void visit(Modifier n, Void arg) { printer.print(n.getKeyword().asString()); printer.print(" "); } @Override - public void visit(final ArrayAccessExpr n, final Void arg) { + public void visit(final ArrayAccessExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -644,7 +633,7 @@ public void visit(final ArrayAccessExpr n, final Void arg) { } @Override - public void visit(final ArrayCreationExpr n, final Void arg) { + public void visit(final ArrayCreationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("new "); @@ -659,7 +648,7 @@ public void visit(final ArrayCreationExpr n, final Void arg) { } @Override - public void visit(final AssignExpr n, final Void arg) { + public void visit(final AssignExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getTarget().accept(this, arg); @@ -677,7 +666,7 @@ public void visit(final AssignExpr n, final Void arg) { * work in progress for issue-545 */ @Override - public void visit(final BinaryExpr n, final Void arg) { + public void visit(final BinaryExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getLeft().accept(this, arg); @@ -692,7 +681,7 @@ public void visit(final BinaryExpr n, final Void arg) { } @Override - public void visit(final CastExpr n, final Void arg) { + public void visit(final CastExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("("); @@ -702,7 +691,7 @@ public void visit(final CastExpr n, final Void arg) { } @Override - public void visit(final ClassExpr n, final Void arg) { + public void visit(final ClassExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getType().accept(this, arg); @@ -710,7 +699,7 @@ public void visit(final ClassExpr n, final Void arg) { } @Override - public void visit(final ConditionalExpr n, final Void arg) { + public void visit(final ConditionalExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getCondition().accept(this, arg); @@ -721,7 +710,7 @@ public void visit(final ConditionalExpr n, final Void arg) { } @Override - public void visit(final EnclosedExpr n, final Void arg) { + public void visit(final EnclosedExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("("); @@ -730,7 +719,7 @@ public void visit(final EnclosedExpr n, final Void arg) { } @Override - public void visit(final FieldAccessExpr n, final Void arg) { + public void visit(final FieldAccessExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getScope().accept(this, arg); @@ -739,7 +728,7 @@ public void visit(final FieldAccessExpr n, final Void arg) { } @Override - public void visit(final InstanceOfExpr n, final Void arg) { + public void visit(final InstanceOfExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getExpression().accept(this, arg); @@ -752,7 +741,7 @@ public void visit(final InstanceOfExpr n, final Void arg) { } @Override - public void visit(final TypePatternExpr n, final Void arg) { + public void visit(final TypePatternExpr n, final Void arg) { printModifiers(n.getModifiers()); n.getType().accept(this, arg); printer.print(" "); @@ -760,7 +749,7 @@ public void visit(final TypePatternExpr n, final Void arg) { } @Override - public void visit(final RecordPatternExpr n, final Void arg) { + public void visit(final RecordPatternExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getType().accept(this, arg); @@ -768,148 +757,148 @@ public void visit(final RecordPatternExpr n, final Void arg) { } @Override - public void visit(JmlQuantifiedExpr jmlQuantifiedExpr, Void arg) { + public void visit(JmlQuantifiedExpr jmlQuantifiedExpr, Void arg) { } @Override - public void visit(JmlClauseLabel n, Void arg) { + public void visit(JmlClauseLabel n, Void arg) { } @Override - public void visit(JmlExpressionStmt n, Void arg) { + public void visit(JmlExpressionStmt n, Void arg) { } @Override - public void visit(JmlLabelExpr n, Void arg) { + public void visit(JmlLabelExpr n, Void arg) { } @Override - public void visit(JmlLetExpr n, Void arg) { + public void visit(JmlLetExpr n, Void arg) { } @Override - public void visit(JmlMultiCompareExpr n, Void arg) { + public void visit(JmlMultiCompareExpr n, Void arg) { } @Override - public void visit(JmlSimpleExprClause n, Void arg) { + public void visit(JmlSimpleExprClause n, Void arg) { } @Override - public void visit(JmlSignalsClause n, Void arg) { + public void visit(JmlSignalsClause n, Void arg) { } @Override - public void visit(JmlSignalsOnlyClause n, Void arg) { + public void visit(JmlSignalsOnlyClause n, Void arg) { } @Override - public void visit(JmlUnreachableStmt n, Void arg) { + public void visit(JmlUnreachableStmt n, Void arg) { } @Override - public void visit(JmlCallableClause n, Void arg) { + public void visit(JmlCallableClause n, Void arg) { } @Override - public void visit(JmlForallClause n, Void arg) { + public void visit(JmlForallClause n, Void arg) { } @Override - public void visit(JmlRefiningStmt n, Void arg) { + public void visit(JmlRefiningStmt n, Void arg) { } @Override - public void visit(JmlClauseIf n, Void arg) { + public void visit(JmlClauseIf n, Void arg) { } @Override - public void visit(JmlClassExprDeclaration n, Void arg) { + public void visit(JmlClassExprDeclaration n, Void arg) { } @Override - public void visit(JmlClassAccessibleDeclaration n, Void arg) { + public void visit(JmlClassAccessibleDeclaration n, Void arg) { } @Override - public void visit(JmlRepresentsDeclaration n, Void arg) { + public void visit(JmlRepresentsDeclaration n, Void arg) { } @Override - public void visit(JmlContract n, Void arg) { + public void visit(JmlContract n, Void arg) { } @Override - public void visit(JmlSetComprehensionExpr n, Void arg) { + public void visit(JmlSetComprehensionExpr n, Void arg) { } @Override - public void visit(JmlGhostStmt n, Void arg) { + public void visit(JmlGhostStmt n, Void arg) { } @Override - public void visit(JmlMethodDeclaration n, Void arg) { + public void visit(JmlMethodDeclaration n, Void arg) { n.getMethodDeclaration().accept(this, arg); } @Override - public void visit(JmlBinaryInfixExpr n, Void arg) { + public void visit(JmlBinaryInfixExpr n, Void arg) { } @Override - public void visit(JmlDocDeclaration n, Void arg) { + public void visit(JmlDocDeclaration n, Void arg) { n.getJmlComments().forEach(it -> it.accept(this, arg)); } @Override - public void visit(JmlDocStmt n, Void arg) { + public void visit(JmlDocStmt n, Void arg) { n.getJmlComments().forEach(it -> it.accept(this, arg)); } @Override - public void visit(JmlDoc n, Void arg) { + public void visit(JmlDoc n, Void arg) { printer.print(n.getContent().asString()); } @Override - public void visit(JmlDocType n, Void arg) { + public void visit(JmlDocType n, Void arg) { } @Override - public void visit(JmlFieldDeclaration n, Void arg) { + public void visit(JmlFieldDeclaration n, Void arg) { } @Override - public void visit(JmlOldClause n, Void arg) { + public void visit(JmlOldClause n, Void arg) { } @Override - public void visit(JmlTypeExpr n, Void arg) { + public void visit(JmlTypeExpr n, Void arg) { n.getType().accept(this, arg); } @Override - public void visit(JmlMultiExprClause n, Void arg) { + public void visit(JmlMultiExprClause n, Void arg) { } @Override - public void visit(JmlBeginStmt n, Void arg) { + public void visit(JmlBeginStmt n, Void arg) { } @Override - public void visit(JmlEndStmt n, Void arg) { + public void visit(JmlEndStmt n, Void arg) { } @Override - public void visit(JmlLabelStmt n, Void arg) { + public void visit(JmlLabelStmt n, Void arg) { } @Override - public void visit(JmlMethodSignature n, Void arg) { + public void visit(JmlMethodSignature n, Void arg) { } @Override - public void visit(final CharLiteralExpr n, final Void arg) { + public void visit(final CharLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("'"); @@ -918,28 +907,28 @@ public void visit(final CharLiteralExpr n, final Void arg) { } @Override - public void visit(final DoubleLiteralExpr n, final Void arg) { + public void visit(final DoubleLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final IntegerLiteralExpr n, final Void arg) { + public void visit(final IntegerLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final LongLiteralExpr n, final Void arg) { + public void visit(final LongLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(n.getValue()); } @Override - public void visit(final StringLiteralExpr n, final Void arg) { + public void visit(final StringLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("\""); @@ -948,7 +937,7 @@ public void visit(final StringLiteralExpr n, final Void arg) { } @Override - public void visit(final TextBlockLiteralExpr n, final Void arg) { + public void visit(final TextBlockLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("\"\"\""); @@ -962,21 +951,21 @@ public void visit(final TextBlockLiteralExpr n, final Void arg) { } @Override - public void visit(final BooleanLiteralExpr n, final Void arg) { + public void visit(final BooleanLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(String.valueOf(n.getValue())); } @Override - public void visit(final NullLiteralExpr n, final Void arg) { + public void visit(final NullLiteralExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("null"); } @Override - public void visit(final ThisExpr n, final Void arg) { + public void visit(final ThisExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getTypeName().isPresent()) { @@ -987,7 +976,7 @@ public void visit(final ThisExpr n, final Void arg) { } @Override - public void visit(final SuperExpr n, final Void arg) { + public void visit(final SuperExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getTypeName().isPresent()) { @@ -998,7 +987,7 @@ public void visit(final SuperExpr n, final Void arg) { } @Override - public void visit(final MethodCallExpr n, final Void arg) { + public void visit(final MethodCallExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); // determine whether we do reindenting for aligmnent at all @@ -1008,24 +997,16 @@ public void visit(final MethodCallExpr n, final Void arg) { AtomicBoolean columnAlignFirstMethodChain = new AtomicBoolean(); if (configuration.isColumnAlignFirstMethodChain()) { // pick the kind of expressions where vertically aligning method calls is okay. - if (n.findAncestor(Statement.class) - .map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()) - .orElse(false)) { + if (n.findAncestor(Statement.class).map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()).orElse(false)) { // search for first parent that does not have its child as scope Node c = n; Optional p = c.getParentNode(); - while (p.isPresent() - && p.filter(NodeWithTraversableScope.class::isInstance) - .map(NodeWithTraversableScope.class::cast) - .flatMap(NodeWithTraversableScope::traverseScope) - .map(c::equals) - .orElse(false)) { + while (p.isPresent() && p.filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(c::equals).orElse(false)) { c = p.get(); p = c.getParentNode(); } // check if the parent is a method call and thus we are in an argument list - columnAlignFirstMethodChain.set( - !p.filter(MethodCallExpr.class::isInstance).isPresent()); + columnAlignFirstMethodChain.set(!p.filter(MethodCallExpr.class::isInstance).isPresent()); } } // we are at the last method call of a call chain @@ -1033,12 +1014,7 @@ public void visit(final MethodCallExpr n, final Void arg) { AtomicBoolean lastMethodInCallChain = new AtomicBoolean(true); if (columnAlignFirstMethodChain.get()) { Node node = n; - while (node.getParentNode() - .filter(NodeWithTraversableScope.class::isInstance) - .map(NodeWithTraversableScope.class::cast) - .flatMap(NodeWithTraversableScope::traverseScope) - .map(node::equals) - .orElse(false)) { + while (node.getParentNode().filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(node::equals).orElse(false)) { node = node.getParentNode().orElseThrow(AssertionError::new); if (node instanceof MethodCallExpr) { lastMethodInCallChain.set(false); @@ -1052,8 +1028,7 @@ public void visit(final MethodCallExpr n, final Void arg) { if (columnAlignFirstMethodChain.get()) { Optional s = n.getScope(); while (s.filter(NodeWithTraversableScope.class::isInstance).isPresent()) { - Optional parentScope = - s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope); + Optional parentScope = s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope); if (s.filter(MethodCallExpr.class::isInstance).isPresent() && parentScope.isPresent()) { methodCallWithScopeInScope.set(true); break; @@ -1097,7 +1072,7 @@ public void visit(final MethodCallExpr n, final Void arg) { } @Override - public void visit(final ObjectCreationExpr n, final Void arg) { + public void visit(final ObjectCreationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.hasScope()) { @@ -1121,7 +1096,7 @@ public void visit(final ObjectCreationExpr n, final Void arg) { } @Override - public void visit(final UnaryExpr n, final Void arg) { + public void visit(final UnaryExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getOperator().isPrefix()) { @@ -1134,7 +1109,7 @@ public void visit(final UnaryExpr n, final Void arg) { } @Override - public void visit(final ConstructorDeclaration n, final Void arg) { + public void visit(final ConstructorDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1170,7 +1145,7 @@ public void visit(final ConstructorDeclaration n, final Void arg) { } @Override - public void visit(final CompactConstructorDeclaration n, final Void arg) { + public void visit(final CompactConstructorDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1195,7 +1170,7 @@ public void visit(final CompactConstructorDeclaration n, final Void arg) { } @Override - public void visit(final MethodDeclaration n, final Void arg) { + public void visit(final MethodDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1243,7 +1218,7 @@ public void visit(final MethodDeclaration n, final Void arg) { } @Override - public void visit(final Parameter n, final Void arg) { + public void visit(final Parameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -1260,7 +1235,7 @@ public void visit(final Parameter n, final Void arg) { } @Override - public void visit(final ReceiverParameter n, final Void arg) { + public void visit(final ReceiverParameter n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printAnnotations(n.getAnnotations(), false, arg); @@ -1270,7 +1245,7 @@ public void visit(final ReceiverParameter n, final Void arg) { } @Override - public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { + public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.isThis()) { @@ -1289,7 +1264,7 @@ public void visit(final ExplicitConstructorInvocationStmt n, final Void arg) { } @Override - public void visit(final VariableDeclarationExpr n, final Void arg) { + public void visit(final VariableDeclarationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getParentNode().map(ExpressionStmt.class::isInstance).orElse(false)) { @@ -1312,21 +1287,21 @@ public void visit(final VariableDeclarationExpr n, final Void arg) { } @Override - public void visit(final LocalClassDeclarationStmt n, final Void arg) { + public void visit(final LocalClassDeclarationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getClassDeclaration().accept(this, arg); } @Override - public void visit(final LocalRecordDeclarationStmt n, final Void arg) { + public void visit(final LocalRecordDeclarationStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getRecordDeclaration().accept(this, arg); } @Override - public void visit(final AssertStmt n, final Void arg) { + public void visit(final AssertStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("assert "); @@ -1339,7 +1314,7 @@ public void visit(final AssertStmt n, final Void arg) { } @Override - public void visit(final BlockStmt n, final Void arg) { + public void visit(final BlockStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.println("{"); @@ -1356,7 +1331,7 @@ public void visit(final BlockStmt n, final Void arg) { } @Override - public void visit(final LabeledStmt n, final Void arg) { + public void visit(final LabeledStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getLabel().accept(this, arg); @@ -1365,14 +1340,14 @@ public void visit(final LabeledStmt n, final Void arg) { } @Override - public void visit(final EmptyStmt n, final Void arg) { + public void visit(final EmptyStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(";"); } @Override - public void visit(final ExpressionStmt n, final Void arg) { + public void visit(final ExpressionStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getExpression().accept(this, arg); @@ -1380,13 +1355,13 @@ public void visit(final ExpressionStmt n, final Void arg) { } @Override - public void visit(final SwitchStmt n, final Void arg) { + public void visit(final SwitchStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printSwitchNode(n, arg); } @Override - public void visit(SwitchExpr n, Void arg) { + public void visit(SwitchExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printSwitchNode(n, arg); } @@ -1407,7 +1382,7 @@ private void printSwitchNode(SwitchNode n, Void arg) { } @Override - public void visit(final SwitchEntry n, final Void arg) { + public void visit(final SwitchEntry n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); // old/new switch @@ -1445,7 +1420,7 @@ public void visit(final SwitchEntry n, final Void arg) { } @Override - public void visit(final BreakStmt n, final Void arg) { + public void visit(final BreakStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("break"); @@ -1454,7 +1429,7 @@ public void visit(final BreakStmt n, final Void arg) { } @Override - public void visit(final YieldStmt n, final Void arg) { + public void visit(final YieldStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("yield "); @@ -1463,7 +1438,7 @@ public void visit(final YieldStmt n, final Void arg) { } @Override - public void visit(final ReturnStmt n, final Void arg) { + public void visit(final ReturnStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("return"); @@ -1475,7 +1450,7 @@ public void visit(final ReturnStmt n, final Void arg) { } @Override - public void visit(final EnumDeclaration n, final Void arg) { + public void visit(final EnumDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1484,9 +1459,7 @@ public void visit(final EnumDeclaration n, final Void arg) { n.getName().accept(this, arg); if (!n.getImplementedTypes().isEmpty()) { printer.print(" implements "); - for (final Iterator i = - n.getImplementedTypes().iterator(); - i.hasNext(); ) { + for (final Iterator i = n.getImplementedTypes().iterator(); i.hasNext(); ) { final ClassOrInterfaceType c = i.next(); c.accept(this, arg); if (i.hasNext()) { @@ -1498,9 +1471,7 @@ public void visit(final EnumDeclaration n, final Void arg) { printer.indent(); if (n.getEntries().isNonEmpty()) { // Either we hit the constant amount limit in the configurations, or any of the constants has a comment - final boolean alignVertically = n.getEntries().size() - > configuration.getMaxEnumConstantsToAlignHorizontally() - || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent()); + final boolean alignVertically = n.getEntries().size() > configuration.getMaxEnumConstantsToAlignHorizontally() || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent()); printer.println(); for (final Iterator i = n.getEntries().iterator(); i.hasNext(); ) { final EnumConstantDeclaration e = i.next(); @@ -1527,7 +1498,7 @@ public void visit(final EnumDeclaration n, final Void arg) { } @Override - public void visit(final EnumConstantDeclaration n, final Void arg) { + public void visit(final EnumConstantDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1545,7 +1516,7 @@ public void visit(final EnumConstantDeclaration n, final Void arg) { } @Override - public void visit(final InitializerDeclaration n, final Void arg) { + public void visit(final InitializerDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.isStatic()) { @@ -1555,38 +1526,45 @@ public void visit(final InitializerDeclaration n, final Void arg) { } @Override - public void visit(final IfStmt n, final Void arg) { + public void visit(final IfStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("if ("); n.getCondition().accept(this, arg); final boolean thenBlock = n.getThenStmt() instanceof BlockStmt; - if ( // block statement should start on the same line - thenBlock) printer.print(") "); + if (// block statement should start on the same line + thenBlock) + printer.print(") "); else { printer.println(")"); printer.indent(); } n.getThenStmt().accept(this, arg); - if (!thenBlock) printer.unindent(); + if (!thenBlock) + printer.unindent(); if (n.getElseStmt().isPresent()) { - if (thenBlock) printer.print(" "); - else printer.println(); + if (thenBlock) + printer.print(" "); + else + printer.println(); final boolean elseIf = n.getElseStmt().orElse(null) instanceof IfStmt; final boolean elseBlock = n.getElseStmt().orElse(null) instanceof BlockStmt; - if ( // put chained if and start of block statement on a same level - elseIf || elseBlock) printer.print("else "); + if (// put chained if and start of block statement on a same level + elseIf || elseBlock) + printer.print("else "); else { printer.println("else"); printer.indent(); } - if (n.getElseStmt().isPresent()) n.getElseStmt().get().accept(this, arg); - if (!(elseIf || elseBlock)) printer.unindent(); + if (n.getElseStmt().isPresent()) + n.getElseStmt().get().accept(this, arg); + if (!(elseIf || elseBlock)) + printer.unindent(); } } @Override - public void visit(final WhileStmt n, final Void arg) { + public void visit(final WhileStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("while ("); @@ -1596,7 +1574,7 @@ public void visit(final WhileStmt n, final Void arg) { } @Override - public void visit(final ContinueStmt n, final Void arg) { + public void visit(final ContinueStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("continue"); @@ -1605,7 +1583,7 @@ public void visit(final ContinueStmt n, final Void arg) { } @Override - public void visit(final DoStmt n, final Void arg) { + public void visit(final DoStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("do "); @@ -1616,7 +1594,7 @@ public void visit(final DoStmt n, final Void arg) { } @Override - public void visit(final ForEachStmt n, final Void arg) { + public void visit(final ForEachStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("for ("); @@ -1628,7 +1606,7 @@ public void visit(final ForEachStmt n, final Void arg) { } @Override - public void visit(final ForStmt n, final Void arg) { + public void visit(final ForStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("for ("); @@ -1660,7 +1638,7 @@ public void visit(final ForStmt n, final Void arg) { } @Override - public void visit(final ThrowStmt n, final Void arg) { + public void visit(final ThrowStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("throw "); @@ -1669,7 +1647,7 @@ public void visit(final ThrowStmt n, final Void arg) { } @Override - public void visit(final SynchronizedStmt n, final Void arg) { + public void visit(final SynchronizedStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("synchronized ("); @@ -1679,7 +1657,7 @@ public void visit(final SynchronizedStmt n, final Void arg) { } @Override - public void visit(final TryStmt n, final Void arg) { + public void visit(final TryStmt n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("try "); @@ -1714,7 +1692,7 @@ public void visit(final TryStmt n, final Void arg) { } @Override - public void visit(final CatchClause n, final Void arg) { + public void visit(final CatchClause n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print(" catch ("); @@ -1724,7 +1702,7 @@ public void visit(final CatchClause n, final Void arg) { } @Override - public void visit(final AnnotationDeclaration n, final Void arg) { + public void visit(final AnnotationDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1741,7 +1719,7 @@ public void visit(final AnnotationDeclaration n, final Void arg) { } @Override - public void visit(final AnnotationMemberDeclaration n, final Void arg) { + public void visit(final AnnotationMemberDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printMemberAnnotations(n.getAnnotations(), arg); @@ -1758,7 +1736,7 @@ public void visit(final AnnotationMemberDeclaration n, final Void arg) { } @Override - public void visit(final MarkerAnnotationExpr n, final Void arg) { + public void visit(final MarkerAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -1766,7 +1744,7 @@ public void visit(final MarkerAnnotationExpr n, final Void arg) { } @Override - public void visit(final SingleMemberAnnotationExpr n, final Void arg) { + public void visit(final SingleMemberAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -1777,7 +1755,7 @@ public void visit(final SingleMemberAnnotationExpr n, final Void arg) { } @Override - public void visit(final NormalAnnotationExpr n, final Void arg) { + public void visit(final NormalAnnotationExpr n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("@"); @@ -1796,7 +1774,7 @@ public void visit(final NormalAnnotationExpr n, final Void arg) { } @Override - public void visit(final MemberValuePair n, final Void arg) { + public void visit(final MemberValuePair n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); n.getName().accept(this, arg); @@ -1805,16 +1783,15 @@ public void visit(final MemberValuePair n, final Void arg) { } @Override - public void visit(final LineComment n, final Void arg) { + public void visit(final LineComment n, final Void arg) { if (configuration.isIgnoreComments()) { return; } - printer.print(n.getHeader()) - .println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), "")); + printer.print(n.getHeader()).println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), "")); } @Override - public void visit(final BlockComment n, final Void arg) { + public void visit(final BlockComment n, final Void arg) { if (configuration.isIgnoreComments()) { return; } @@ -1834,7 +1811,7 @@ public void visit(final BlockComment n, final Void arg) { } @Override - public void visit(LambdaExpr n, Void arg) { + public void visit(LambdaExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); final NodeList parameters = n.getParameters(); @@ -1863,7 +1840,7 @@ public void visit(LambdaExpr n, Void arg) { } @Override - public void visit(MethodReferenceExpr n, Void arg) { + public void visit(MethodReferenceExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); Expression scope = n.getScope(); @@ -1879,7 +1856,7 @@ public void visit(MethodReferenceExpr n, Void arg) { } @Override - public void visit(TypeExpr n, Void arg) { + public void visit(TypeExpr n, Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); if (n.getType() != null) { @@ -1888,12 +1865,11 @@ public void visit(TypeExpr n, Void arg) { } @Override - public void visit(NodeList n, Void arg) { + public void visit(NodeList n, Void arg) { if (configuration.isOrderImports() && n.size() > 0 && n.get(0) instanceof ImportDeclaration) { // noinspection unchecked NodeList modifiableList = new NodeList<>(n); - modifiableList.sort(comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1) - .thenComparing(NodeWithName::getNameAsString)); + modifiableList.sort(comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1).thenComparing(NodeWithName::getNameAsString)); for (Object node : modifiableList) { ((Node) node).accept(this, arg); } @@ -1905,7 +1881,7 @@ public void visit(NodeList n, Void arg) { } @Override - public void visit(final ImportDeclaration n, final Void arg) { + public void visit(final ImportDeclaration n, final Void arg) { printOrphanCommentsBeforeThisChildNode(n); printComment(n.getComment(), arg); printer.print("import "); @@ -1921,7 +1897,7 @@ public void visit(final ImportDeclaration n, final Void arg) { } @Override - public void visit(ModuleDeclaration n, Void arg) { + public void visit(ModuleDeclaration n, Void arg) { printMemberAnnotations(n.getAnnotations(), arg); if (n.isOpen()) { printer.print("open "); @@ -1934,7 +1910,7 @@ public void visit(ModuleDeclaration n, Void arg) { } @Override - public void visit(ModuleRequiresDirective n, Void arg) { + public void visit(ModuleRequiresDirective n, Void arg) { printer.print("requires "); printModifiers(n.getModifiers()); n.getName().accept(this, arg); @@ -1942,7 +1918,7 @@ public void visit(ModuleRequiresDirective n, Void arg) { } @Override - public void visit(ModuleExportsDirective n, Void arg) { + public void visit(ModuleExportsDirective n, Void arg) { printer.print("exports "); n.getName().accept(this, arg); printPrePostFixOptionalList(n.getModuleNames(), arg, " to ", ", ", ""); @@ -1950,7 +1926,7 @@ public void visit(ModuleExportsDirective n, Void arg) { } @Override - public void visit(ModuleProvidesDirective n, Void arg) { + public void visit(ModuleProvidesDirective n, Void arg) { printer.print("provides "); n.getName().accept(this, arg); printPrePostFixRequiredList(n.getWith(), arg, " with ", ", ", ""); @@ -1958,14 +1934,14 @@ public void visit(ModuleProvidesDirective n, Void arg) { } @Override - public void visit(ModuleUsesDirective n, Void arg) { + public void visit(ModuleUsesDirective n, Void arg) { printer.print("uses "); n.getName().accept(this, arg); printer.println(";"); } @Override - public void visit(ModuleOpensDirective n, Void arg) { + public void visit(ModuleOpensDirective n, Void arg) { printer.print("opens "); n.getName().accept(this, arg); printPrePostFixOptionalList(n.getModuleNames(), arg, " to ", ", ", ""); @@ -1973,15 +1949,18 @@ public void visit(ModuleOpensDirective n, Void arg) { } @Override - public void visit(UnparsableStmt n, Void arg) { + public void visit(UnparsableStmt n, Void arg) { printer.print("???;"); } private void printOrphanCommentsBeforeThisChildNode(final Node node) { - if (configuration.isIgnoreComments()) return; - if (node instanceof Comment) return; + if (configuration.isIgnoreComments()) + return; + if (node instanceof Comment) + return; Node parent = node.getParentNode().orElse(null); - if (parent == null) return; + if (parent == null) + return; List everything = new ArrayList<>(parent.getChildNodes()); sortByBeginPosition(everything); int positionOfTheChild = -1; @@ -1997,23 +1976,22 @@ private void printOrphanCommentsBeforeThisChildNode(final Node node) { } int positionOfPreviousChild = -1; for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) { - if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i; + if (!(everything.get(i) instanceof Comment)) + positionOfPreviousChild = i; } for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) { Node nodeToPrint = everything.get(i); if (!(nodeToPrint instanceof Comment)) - throw new RuntimeException( - "Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " - + positionOfPreviousChild + ", position of child " + positionOfTheChild); + throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild); nodeToPrint.accept(this, null); } } private void printOrphanCommentsEnding(final Node node) { - if (configuration.isIgnoreComments()) return; + if (configuration.isIgnoreComments()) + return; // extract all nodes for which the position/range is indicated to avoid to skip orphan comments - List everything = - node.getChildNodes().stream().filter(n -> n.hasRange()).collect(Collectors.toList()); + List everything = node.getChildNodes().stream().filter(n -> n.hasRange()).collect(Collectors.toList()); sortByBeginPosition(everything); if (everything.isEmpty()) { return; @@ -2033,10 +2011,12 @@ private void printOrphanCommentsEnding(final Node node) { } private void indentIf(boolean expr) { - if (expr) printer.indent(); + if (expr) + printer.indent(); } private void unindentIf(boolean expr) { - if (expr) printer.unindent(); + if (expr) + printer.unindent(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java index e56ed346cd..cfc774f6d9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java @@ -31,26 +31,24 @@ * This class is no longer acceptable to use because it is not sufficiently configurable and it is too tied to a specific implementation *

    Use {@link Printer interface or DefaultPrettyPrinter default implementation } instead. * - * @deprecated This class could be removed in a future version. Use default DefaultPrettyPrinter. + * @deprecated This class could be removed in a future version. Use defaultPrettyPrinter. */ @Deprecated -public class PrettyPrinter implements Printer { +public class PrettyPrinter implements Printer { private PrinterConfiguration configuration; private Function> visitorFactory; - public PrettyPrinter() { + public PrettyPrinter() { this(new PrettyPrinterConfiguration()); } - public PrettyPrinter(PrettyPrinterConfiguration configuration) { + public PrettyPrinter(PrettyPrinterConfiguration configuration) { this(configuration, PrettyPrintVisitor::new); } - public PrettyPrinter( - PrettyPrinterConfiguration configuration, - Function> visitorFactory) { + public PrettyPrinter(PrettyPrinterConfiguration configuration, Function> visitorFactory) { this.configuration = configuration; this.visitorFactory = visitorFactory; } @@ -58,23 +56,22 @@ public PrettyPrinter( /* * Returns the PrettyPrinter configuration */ - public PrinterConfiguration getConfiguration() { + public PrinterConfiguration getConfiguration() { return configuration; } /* * set or update the PrettyPrinter configuration */ - public Printer setConfiguration(PrinterConfiguration configuration) { + public Printer setConfiguration(PrinterConfiguration configuration) { if (!(configuration instanceof PrettyPrinterConfiguration)) - throw new IllegalArgumentException( - "PrettyPrinter must be configured with a PrettyPrinterConfiguration class"); + throw new IllegalArgumentException("PrettyPrinter must be configured with a PrettyPrinterConfiguration class"); this.configuration = configuration; return this; } @Override - public String print(Node node) { + public String print(Node node) { final VoidVisitor visitor = visitorFactory.apply((PrettyPrinterConfiguration) configuration); node.accept(visitor, null); return visitor.toString(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/Printer.java b/javaparser-core/src/main/java/com/github/javaparser/printer/Printer.java index 72a363d218..232b9541c5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/Printer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/Printer.java @@ -26,7 +26,7 @@ * Printer interface defines the API for a printer. * A printer outputs the AST as formatted Java source code. */ -public interface Printer { +public interface Printer { String print(Node node); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java index 78cbe5a0b2..53d4a10c0c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java @@ -31,7 +31,7 @@ /** * A support class for code that outputs formatted source code. */ -public class SourcePrinter { +public class SourcePrinter { private String endOfLineCharacter; @@ -59,15 +59,7 @@ public class SourcePrinter { } SourcePrinter(final PrinterConfiguration configuration) { - this( - configuration - .get(new DefaultConfigurationOption(ConfigOption.INDENTATION)) - .get() - .asValue(), - configuration - .get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)) - .get() - .asString()); + this(configuration.get(new DefaultConfigurationOption(ConfigOption.INDENTATION)).get().asValue(), configuration.get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)).get().asString()); } SourcePrinter(Indentation indentation, String eol) { @@ -80,9 +72,9 @@ public class SourcePrinter { * Add the default indentation to the current indentation and push it on the indentation stack. * Does not actually output anything. */ - public SourcePrinter indent() { + public SourcePrinter indent() { String currentIndent = indents.peek(); - switch (indentation.getType()) { + switch(indentation.getType()) { case SPACES: case TABS_WITH_SPACE_ALIGN: indents.push(currentIndent + indentation.getIndent()); @@ -100,7 +92,7 @@ public SourcePrinter indent() { * Add to the current indentation until it is reaches "column" and push it on the indentation stack. * Does not actually output anything. */ - public SourcePrinter indentWithAlignTo(int column) { + public SourcePrinter indentWithAlignTo(int column) { indents.push(calculateIndentWithAlignTo(column)); return this; } @@ -110,7 +102,7 @@ private String calculateIndentWithAlignTo(int column) { throw new IllegalStateException("Attempt to indent less than the previous indent."); } StringBuilder newIndent = new StringBuilder(lastPrintedIndent); - switch (indentation.getType()) { + switch(indentation.getType()) { case SPACES: case TABS_WITH_SPACE_ALIGN: while (newIndent.length() < column) { @@ -133,15 +125,9 @@ private String calculateIndentWithAlignTo(int column) { fullTab.append(IndentType.SPACES.getCar()); } String fullTabString = fullTab.toString(); - if ((newIndent.length() >= currentIndentType.getWidth()) - && newIndent - .substring(newIndent.length() - currentIndentType.getWidth()) - .equals(fullTabString)) { + if ((newIndent.length() >= currentIndentType.getWidth()) && newIndent.substring(newIndent.length() - currentIndentType.getWidth()).equals(fullTabString)) { int i = newIndent.indexOf(fullTabString); - newIndent.replace( - i, - i + currentIndentType.getWidth(), - currentIndentType.getCar().toString()); + newIndent.replace(i, i + currentIndentType.getWidth(), currentIndentType.getCar().toString()); } break; default: @@ -154,7 +140,7 @@ private String calculateIndentWithAlignTo(int column) { * Pop the last indentation of the indentation stack. * Does not actually output anything. */ - public SourcePrinter unindent() { + public SourcePrinter unindent() { if (indents.isEmpty()) { // Since we start out with an empty indent on the stack, this will only occur // the second time we over-unindent. @@ -182,7 +168,7 @@ private void append(String arg) { * @return this instance, for nesting calls to method as fluent interface * @see SourcePrinter#println(String) */ - public SourcePrinter print(final String arg) { + public SourcePrinter print(final String arg) { if (!indented) { lastPrintedIndent = indents.peek(); append(lastPrintedIndent); @@ -203,7 +189,7 @@ public SourcePrinter print(final String arg) { * @param arg source line to be printed (should not contain newline/carriage-return characters) * @return this instance, for nesting calls to method as fluent interface */ - public SourcePrinter println(final String arg) { + public SourcePrinter println(final String arg) { print(arg); println(); return this; @@ -214,7 +200,7 @@ public SourcePrinter println(final String arg) { * * @return this instance, for nesting calls to method as fluent interface */ - public SourcePrinter println() { + public SourcePrinter println() { buf.append(endOfLineCharacter); // Start before the first column cursor = new Position(cursor.line + 1, Position.FIRST_COLUMN - 1); @@ -232,7 +218,7 @@ public SourcePrinter println() { * * @return the current cursor position (line, column). */ - public Position getCursor() { + public Position getCursor() { return cursor; } @@ -241,7 +227,7 @@ public Position getCursor() { * @deprecated use toString() */ @Deprecated - public String getSource() { + public String getSource() { return toString(); } @@ -249,14 +235,14 @@ public String getSource() { * @return the currently printed source code. */ @Override - public String toString() { + public String toString() { return buf.toString(); } /** * Changes all EOL characters in "content" to the EOL character this SourcePrinter is using. */ - public String normalizeEolInTextBlock(String content) { + public String normalizeEolInTextBlock(String content) { return Utils.normalizeEolInTextBlock(content, endOfLineCharacter); } @@ -264,7 +250,7 @@ public String normalizeEolInTextBlock(String content) { * Set the top-most indent to the column the cursor is currently in, can be undone with * {@link #reindentToPreviousLevel()}. Does not actually output anything. */ - public void reindentWithAlignToCursor() { + public void reindentWithAlignToCursor() { String newIndent = calculateIndentWithAlignTo(cursor.column); reindentedIndents.push(indents.pop()); indents.push(newIndent); @@ -274,7 +260,7 @@ public void reindentWithAlignToCursor() { * Set the top-most indent to the column the cursor was before the last {@link #reindentWithAlignToCursor()} call. * Does not actually output anything. */ - public void reindentToPreviousLevel() { + public void reindentToPreviousLevel() { if (reindentedIndents.isEmpty()) { throw new IllegalStateException("Reindent calls are not well-balanced."); } @@ -288,7 +274,7 @@ public void reindentToPreviousLevel() { * Once you do know, you can pop this indent ("unindent") and indent to the right column. * (Does not actually output anything.) */ - public void duplicateIndent() { + public void duplicateIndent() { indents.push(indents.peek()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/Stringable.java b/javaparser-core/src/main/java/com/github/javaparser/printer/Stringable.java index faa6373bf9..817910256e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/Stringable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/Stringable.java @@ -23,7 +23,7 @@ /** * Something that has a printable form. I.e., it can be converted to a user-facing String. */ -public interface Stringable { +public interface Stringable { String asString(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java index 2bb5cb8dcf..462ce8d767 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java @@ -25,9 +25,7 @@ import com.github.javaparser.ast.type.Type; import com.github.javaparser.metamodel.NodeMetaModel; import com.github.javaparser.metamodel.PropertyMetaModel; - import java.util.List; - import static com.github.javaparser.utils.Utils.assertNotNull; import static com.github.javaparser.utils.Utils.assertNonEmpty; import java.io.StringWriter; @@ -40,13 +38,13 @@ /** * Outputs an XML file containing the AST meant for inspecting it. */ -public class XmlPrinter { +public class XmlPrinter { private final boolean outputNodeType; private static final Class TYPE_CLASS = Type.class; - public XmlPrinter(boolean outputNodeType) { + public XmlPrinter(boolean outputNodeType) { this.outputNodeType = outputNodeType; } @@ -56,7 +54,7 @@ public XmlPrinter(boolean outputNodeType) { * @param node AST node to be converted to XML * @return XML document corresponding to node */ - public String output(Node node) { + public String output(Node node) { return stringWriterOutput(node, "root").toString(); } @@ -70,7 +68,7 @@ public String output(Node node) { * @param builder Target object to receive the generated XML */ @Deprecated - public void output(Node node, String name, int level, StringBuilder builder) { + public void output(Node node, String name, int level, StringBuilder builder) { builder.append(stringWriterOutput(node, name).toString()); } @@ -87,7 +85,7 @@ public void output(Node node, String name, int level, StringBuilder builder) { * @throws RuntimeXMLStreamException Unchecked exception wrapping checked {@link XMLStreamException}, when any * error on producing XML output occours */ - public StringWriter stringWriterOutput(Node node, String name) { + public StringWriter stringWriterOutput(Node node, String name) { StringWriter stringWriter = new StringWriter(); try { outputDocument(node, name, stringWriter); @@ -112,7 +110,7 @@ public StringWriter stringWriterOutput(Node node, String name) { * @param writer Target to get the document writen to * @throws XMLStreamException When any error on outputting XML occours */ - public void outputDocument(Node node, String name, Writer writer) throws XMLStreamException { + public void outputDocument(Node node, String name, Writer writer) throws XMLStreamException { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLStreamWriter xmlWriter = outputFactory.createXMLStreamWriter(writer); try { @@ -145,7 +143,7 @@ public void outputDocument(Node node, String name, Writer writer) throws XMLStre * @throws XMLStreamException When any error on outputting XML occours * @see outputNode(String, Node, XMLStreamWriter) */ - public void outputDocument(Node node, String name, XMLStreamWriter xmlWriter) throws XMLStreamException { + public void outputDocument(Node node, String name, XMLStreamWriter xmlWriter) throws XMLStreamException { xmlWriter.writeStartDocument(); outputNode(node, name, xmlWriter); xmlWriter.writeEndDocument(); @@ -171,15 +169,14 @@ public void outputDocument(Node node, String name, XMLStreamWriter xmlWriter) th * @throws XMLStreamException When any error on outputting XML occours * @see outputDocument(String, Node, XMLStreamWriter) */ - public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws XMLStreamException { + public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws XMLStreamException { assertNotNull(node); assertNonEmpty(name); assertNotNull(xmlWriter); NodeMetaModel metaModel = node.getMetaModel(); List allPropertyMetaModels = metaModel.getAllPropertyMetaModels(); Predicate nonNullNode = propertyMetaModel -> propertyMetaModel.getValue(node) != null; - Predicate nonEmptyList = - propertyMetaModel -> ((NodeList) propertyMetaModel.getValue(node)).isNonEmpty(); + Predicate nonEmptyList = propertyMetaModel -> ((NodeList) propertyMetaModel.getValue(node)).isNonEmpty(); Predicate typeList = propertyMetaModel -> TYPE_CLASS == propertyMetaModel.getType(); xmlWriter.writeStartElement(name); // Output node type attribute @@ -191,8 +188,7 @@ public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).forEach(attributeMetaModel -> { try { final String attributeName = attributeMetaModel.getName(); - final String attributeValue = - attributeMetaModel.getValue(node).toString(); + final String attributeValue = attributeMetaModel.getValue(node).toString(); xmlWriter.writeAttribute(attributeName, attributeValue); } catch (XMLStreamException ex) { throw new RuntimeXMLStreamException(ex); @@ -243,11 +239,11 @@ public static void print(Node node) { */ class RuntimeXMLStreamException extends RuntimeException { - public RuntimeXMLStreamException(XMLStreamException cause) { + public RuntimeXMLStreamException(XMLStreamException cause) { super(cause); } - public XMLStreamException getXMLStreamCause() { + public XMLStreamException getXMLStreamCause() { return (XMLStreamException) super.getCause(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java index 80b63d6bc8..5b586e1ae4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java @@ -24,26 +24,24 @@ import com.github.javaparser.ast.NodeList; import com.github.javaparser.metamodel.NodeMetaModel; import com.github.javaparser.metamodel.PropertyMetaModel; - import java.util.List; - import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.toList; /** * Outputs a YAML file containing the AST meant for inspecting it. */ -public class YamlPrinter { +public class YamlPrinter { private static final int NUM_SPACES_FOR_INDENT = 4; private final boolean outputNodeType; - public YamlPrinter(boolean outputNodeType) { + public YamlPrinter(boolean outputNodeType) { this.outputNodeType = outputNodeType; } - public String output(Node node) { + public String output(Node node) { StringBuilder output = new StringBuilder(); output.append("---"); output(node, "root", 0, output); @@ -51,32 +49,25 @@ public String output(Node node) { return output.toString(); } - public void output(Node node, String name, int level, StringBuilder builder) { + public void output(Node node, String name, int level, StringBuilder builder) { assertNotNull(node); NodeMetaModel metaModel = node.getMetaModel(); List allPropertyMetaModels = metaModel.getAllPropertyMetaModels(); - List attributes = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isAttribute) - .filter(PropertyMetaModel::isSingular) - .collect(toList()); - List subNodes = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isNode) - .filter(PropertyMetaModel::isSingular) - .collect(toList()); - List subLists = allPropertyMetaModels.stream() - .filter(PropertyMetaModel::isNodeList) - .collect(toList()); + List attributes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).collect(toList()); + List subNodes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNode).filter(PropertyMetaModel::isSingular).collect(toList()); + List subLists = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNodeList).collect(toList()); if (outputNodeType) builder.append(System.lineSeparator() + indent(level) + name + "(Type=" + metaModel.getTypeName() + "): "); - else builder.append(System.lineSeparator() + indent(level) + name + ": "); + else + builder.append(System.lineSeparator() + indent(level) + name + ": "); level++; for (PropertyMetaModel a : attributes) { - builder.append(System.lineSeparator() + indent(level) + a.getName() + ": " - + escapeValue(a.getValue(node).toString())); + builder.append(System.lineSeparator() + indent(level) + a.getName() + ": " + escapeValue(a.getValue(node).toString())); } for (PropertyMetaModel sn : subNodes) { Node nd = (Node) sn.getValue(node); - if (nd != null) output(nd, sn.getName(), level, builder); + if (nd != null) + output(nd, sn.getName(), level, builder); } for (PropertyMetaModel sl : subLists) { NodeList nl = (NodeList) sl.getValue(node); @@ -96,15 +87,7 @@ private String indent(int level) { } private String escapeValue(String value) { - return "\"" - + value.replace("\\", "\\\\") - .replaceAll("\"", "\\\\\"") - .replace("\n", "\\n") - .replace("\r", "\\r") - .replace("\f", "\\f") - .replace("\b", "\\b") - .replace("\t", "\\t") - + "\""; + return "\"" + value.replace("\\", "\\\\").replaceAll("\"", "\\\\\"").replace("\n", "\\n").replace("\r", "\\r").replace("\f", "\\f").replace("\b", "\\b").replace("\t", "\\t") + "\""; } public static void print(Node node) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java index 7618318bc7..a941eca4b5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java @@ -21,27 +21,26 @@ package com.github.javaparser.printer.concretesyntaxmodel; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.IntegerLiteralExpr; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.printer.SourcePrinter; -public class CsmAttribute implements CsmElement { +public class CsmAttribute implements CsmElement { - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } private final ObservableProperty property; - public CsmAttribute(ObservableProperty property) { + public CsmAttribute(ObservableProperty property) { this.property = property; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { Object value = property.getRawValue(node); printer.print(PrintingHelper.printToString(value)); } @@ -52,33 +51,31 @@ public void prettyPrint(Node node, SourcePrinter printer) { * * @param tokenText Operator's token text */ - public int getTokenType(Node node, String text, String tokenText) { - switch (property) { + public int getTokenType(Node node, String text, String tokenText) { + switch(property) { case IDENTIFIER: return GeneratedJavaParserConstants.IDENTIFIER; - case TYPE: { - String expectedImage = "\"" + text.toLowerCase() + "\""; - for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) { - if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) { - return i; + case TYPE: + { + String expectedImage = "\"" + text.toLowerCase() + "\""; + for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) { + if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) { + return i; + } } + throw new RuntimeException(f("Attribute '%s' does not corresponding to any expected value. Text: %s", property.camelCaseName(), text)); } - throw new RuntimeException(f( - "Attribute '%s' does not corresponding to any expected value. Text: %s", - property.camelCaseName(), text)); - } case KEYWORD: - case OPERATOR: { - String expectedImage = "\"" + tokenText.toLowerCase() + "\""; - for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) { - if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) { - return i; + case OPERATOR: + { + String expectedImage = "\"" + tokenText.toLowerCase() + "\""; + for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) { + if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) { + return i; + } } + throw new RuntimeException(f("Attribute '%s' does not corresponding to any expected value. Text: %s", property.camelCaseName(), tokenText)); } - throw new RuntimeException(f( - "Attribute '%s' does not corresponding to any expected value. Text: %s", - property.camelCaseName(), tokenText)); - } case VALUE: if (node instanceof IntegerLiteralExpr) { return GeneratedJavaParserConstants.INTEGER_LITERAL; @@ -86,12 +83,11 @@ public int getTokenType(Node node, String text, String tokenText) { case NAME: return GeneratedJavaParserConstants.IDENTIFIER; } - throw new UnsupportedOperationException( - "getTokenType does not know how to handle property " + property + " with text: " + text); + throw new UnsupportedOperationException("getTokenType does not know how to handle property " + property + " with text: " + text); } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmChar.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmChar.java index 3b453abf0b..e1dea06614 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmChar.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmChar.java @@ -24,27 +24,27 @@ import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.printer.SourcePrinter; -public class CsmChar implements CsmElement { +public class CsmChar implements CsmElement { private final ObservableProperty property; - public CsmChar(ObservableProperty property) { + public CsmChar(ObservableProperty property) { this.property = property; } - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { printer.print("'"); printer.print(property.getValueAsStringAttribute(node)); printer.print("'"); } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmComment.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmComment.java index e0cc2d4787..df3ea687de 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmComment.java @@ -24,7 +24,7 @@ import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.printer.SourcePrinter; -public class CsmComment implements CsmElement { +public class CsmComment implements CsmElement { static void process(Comment comment, SourcePrinter printer) { String content = printer.normalizeEolInTextBlock(comment.getContent()); @@ -34,7 +34,7 @@ static void process(Comment comment, SourcePrinter printer) { } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { node.getComment().ifPresent(c -> process(c, printer)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java index a90a4c0783..a037e80392 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.List; -public class CsmConditional implements CsmElement { +public class CsmConditional implements CsmElement { private final Condition condition; @@ -37,30 +37,31 @@ public class CsmConditional implements CsmElement { private final CsmElement elseElement; - public Condition getCondition() { + public Condition getCondition() { return condition; } - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { if (properties.size() > 1) { throw new IllegalStateException(); } return properties.get(0); } - public List getProperties() { + public List getProperties() { return properties; } - public CsmElement getThenElement() { + public CsmElement getThenElement() { return thenElement; } - public CsmElement getElseElement() { + public CsmElement getElseElement() { return elseElement; } - public enum Condition { + public enum Condition { + IS_EMPTY { @Override @@ -68,43 +69,42 @@ boolean evaluate(Node node, ObservableProperty property) { NodeList value = property.getValueAsMultipleReference(node); return value == null || value.isEmpty(); } - }, - IS_NOT_EMPTY { + } + , IS_NOT_EMPTY { @Override boolean evaluate(Node node, ObservableProperty property) { NodeList value = property.getValueAsMultipleReference(node); return value != null && !value.isEmpty(); } - }, - IS_PRESENT { + } + , IS_PRESENT { @Override boolean evaluate(Node node, ObservableProperty property) { return !property.isNullOrNotPresent(node); } - }, - FLAG { + } + , FLAG { @Override boolean evaluate(Node node, ObservableProperty property) { return property.getValueAsBooleanAttribute(node); } - }; + } + ; abstract boolean evaluate(Node node, ObservableProperty property); } - public CsmConditional( - ObservableProperty property, Condition condition, CsmElement thenElement, CsmElement elseElement) { + public CsmConditional(ObservableProperty property, Condition condition, CsmElement thenElement, CsmElement elseElement) { this.properties = Arrays.asList(property); this.condition = condition; this.thenElement = thenElement; this.elseElement = elseElement; } - public CsmConditional( - List properties, Condition condition, CsmElement thenElement, CsmElement elseElement) { + public CsmConditional(List properties, Condition condition, CsmElement thenElement, CsmElement elseElement) { if (properties.size() < 1) { throw new IllegalArgumentException(); } @@ -114,12 +114,12 @@ public CsmConditional( this.elseElement = elseElement; } - public CsmConditional(ObservableProperty property, Condition condition, CsmElement thenElement) { + public CsmConditional(ObservableProperty property, Condition condition, CsmElement thenElement) { this(property, condition, thenElement, new CsmNone()); } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { boolean test = false; for (ObservableProperty prop : properties) { test = test || condition.evaluate(node, prop); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java index 91c6a86d3d..e2327be3ef 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java @@ -22,7 +22,6 @@ import static com.github.javaparser.TokenTypes.eolTokenKind; import static com.github.javaparser.TokenTypes.spaceTokenKind; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.observer.ObservableProperty; @@ -32,7 +31,7 @@ import java.util.Arrays; import java.util.List; -public interface CsmElement { +public interface CsmElement { void prettyPrint(Node node, SourcePrinter printer); @@ -72,24 +71,15 @@ static CsmElement token(int tokenType) { return new CsmToken(tokenType); } - static CsmElement conditional( - ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement) { + static CsmElement conditional(ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement) { return new CsmConditional(property, condition, thenElement); } - static CsmElement conditional( - ObservableProperty property, - CsmConditional.Condition condition, - CsmElement thenElement, - CsmElement elseElement) { + static CsmElement conditional(ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement, CsmElement elseElement) { return new CsmConditional(property, condition, thenElement, elseElement); } - static CsmElement conditional( - List properties, - CsmConditional.Condition condition, - CsmElement thenElement, - CsmElement elseElement) { + static CsmElement conditional(List properties, CsmConditional.Condition condition, CsmElement thenElement, CsmElement elseElement) { return new CsmConditional(properties, condition, thenElement, elseElement); } @@ -129,17 +119,11 @@ static CsmElement list(ObservableProperty property, CsmElement separator) { return new CsmList(property, CsmElement.none(), separator, new CsmNone(), new CsmNone()); } - static CsmElement list( - ObservableProperty property, CsmElement separator, CsmElement preceeding, CsmElement following) { + static CsmElement list(ObservableProperty property, CsmElement separator, CsmElement preceeding, CsmElement following) { return new CsmList(property, none(), separator, preceeding, following); } - static CsmElement list( - ObservableProperty property, - CsmElement separatorPre, - CsmElement separatorPost, - CsmElement preceeding, - CsmElement following) { + static CsmElement list(ObservableProperty property, CsmElement separatorPre, CsmElement separatorPost, CsmElement preceeding, CsmElement following) { return new CsmList(property, separatorPre, separatorPost, preceeding, following); } @@ -161,12 +145,7 @@ static CsmElement unindent() { } static CsmElement block(CsmElement content) { - return sequence( - token(GeneratedJavaParserConstants.LBRACE), - indent(), - content, - unindent(), - token(GeneratedJavaParserConstants.RBRACE)); + return sequence(token(GeneratedJavaParserConstants.LBRACE), indent(), content, unindent(), token(GeneratedJavaParserConstants.RBRACE)); } /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmIndent.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmIndent.java index bc4dfc7410..dd790df574 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmIndent.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmIndent.java @@ -25,10 +25,10 @@ import com.github.javaparser.printer.lexicalpreservation.TextElement; import com.github.javaparser.printer.lexicalpreservation.TokenTextElement; -public class CsmIndent implements CsmElement { +public class CsmIndent implements CsmElement { @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { printer.indent(); } @@ -36,17 +36,17 @@ public void prettyPrint(Node node, SourcePrinter printer) { * Verifies if the content of the {@code CsmElement} is the same as the provided {@code TextElement} */ @Override - public boolean isCorrespondingElement(TextElement textElement) { + public boolean isCorrespondingElement(TextElement textElement) { return (textElement instanceof TokenTextElement) && ((TokenTextElement) textElement).isSpaceOrTab(); } @Override - public int hashCode() { + public int hashCode() { return 1; } @Override - public boolean equals(Object obj) { + public boolean equals(Object obj) { return obj instanceof CsmIndent; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java index 6c0f502214..c7f08d5679 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Iterator; -public class CsmList implements CsmElement { +public class CsmList implements CsmElement { private final ObservableProperty property; @@ -40,40 +40,35 @@ public class CsmList implements CsmElement { private final CsmElement following; - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } - public CsmElement getSeparatorPost() { + public CsmElement getSeparatorPost() { return separatorPost; } - public CsmElement getSeparatorPre() { + public CsmElement getSeparatorPre() { return separatorPre; } - public CsmElement getPreceeding() { + public CsmElement getPreceeding() { return preceeding; } - public CsmElement getFollowing() { + public CsmElement getFollowing() { return following; } - public CsmList(ObservableProperty property, CsmElement separator) { + public CsmList(ObservableProperty property, CsmElement separator) { this(property, new CsmNone(), separator, new CsmNone(), new CsmNone()); } - public CsmList(ObservableProperty property) { + public CsmList(ObservableProperty property) { this(property, new CsmNone(), new CsmNone(), new CsmNone(), new CsmNone()); } - public CsmList( - ObservableProperty property, - CsmElement separatorPre, - CsmElement separatorPost, - CsmElement preceeding, - CsmElement following) { + public CsmList(ObservableProperty property, CsmElement separatorPre, CsmElement separatorPost, CsmElement preceeding, CsmElement following) { this.property = property; this.separatorPre = separatorPre; this.separatorPost = separatorPost; @@ -82,7 +77,7 @@ public CsmList( } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { if (property.isAboutNodes()) { NodeList nodeList = property.getValueAsMultipleReference(node); if (nodeList == null) { @@ -127,7 +122,7 @@ public void prettyPrint(Node node, SourcePrinter printer) { } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java index db5b80bf2f..7f6e115f71 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java @@ -29,11 +29,11 @@ /** * A group of elements that could be in any order. */ -public class CsmMix implements CsmElement { +public class CsmMix implements CsmElement { private List elements; - public CsmMix(List elements) { + public CsmMix(List elements) { if (elements == null) { throw new NullPointerException(); } @@ -43,30 +43,32 @@ public CsmMix(List elements) { this.elements = elements; } - public List getElements() { + public List getElements() { return elements; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { elements.forEach(e -> e.prettyPrint(node, printer)); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; CsmMix csmMix = (CsmMix) o; return elements != null ? elements.equals(csmMix.elements) : csmMix.elements == null; } @Override - public int hashCode() { + public int hashCode() { return elements != null ? elements.hashCode() : 0; } @Override - public String toString() { + public String toString() { return elements.stream().map(e -> e.toString()).collect(Collectors.joining(",", "CsmMix[", "]")); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java index 46a14c7cd8..18966f6f4b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java @@ -23,8 +23,9 @@ import com.github.javaparser.ast.Node; import com.github.javaparser.printer.SourcePrinter; -public class CsmNone implements CsmElement { +public class CsmNone implements CsmElement { @Override - public void prettyPrint(Node node, SourcePrinter printer) {} + public void prettyPrint(Node node, SourcePrinter printer) { + } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java index 390ad20656..06a709328f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java @@ -21,17 +21,16 @@ package com.github.javaparser.printer.concretesyntaxmodel; import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.printer.SourcePrinter; import java.util.LinkedList; import java.util.List; -public class CsmOrphanCommentsEnding implements CsmElement { +public class CsmOrphanCommentsEnding implements CsmElement { @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { List everything = new LinkedList<>(); everything.addAll(node.getChildNodes()); sortByBeginPosition(everything); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSequence.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSequence.java index a9e71d8d30..5adb69b91a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSequence.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSequence.java @@ -26,11 +26,11 @@ import java.util.Objects; import java.util.stream.Collectors; -public class CsmSequence implements CsmElement { +public class CsmSequence implements CsmElement { private List elements; - public CsmSequence(List elements) { + public CsmSequence(List elements) { if (elements == null) { throw new NullPointerException(); } @@ -40,17 +40,17 @@ public CsmSequence(List elements) { this.elements = elements; } - public List getElements() { + public List getElements() { return elements; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { elements.forEach(e -> e.prettyPrint(node, printer)); } @Override - public String toString() { + public String toString() { return elements.stream().map(e -> e.toString()).collect(Collectors.joining(",", "CsmSequence[", "]")); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSingleReference.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSingleReference.java index 769822ff2b..4ce41fc907 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSingleReference.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmSingleReference.java @@ -25,20 +25,20 @@ import com.github.javaparser.printer.ConcreteSyntaxModel; import com.github.javaparser.printer.SourcePrinter; -public class CsmSingleReference implements CsmElement { +public class CsmSingleReference implements CsmElement { private final ObservableProperty property; - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } - public CsmSingleReference(ObservableProperty property) { + public CsmSingleReference(ObservableProperty property) { this.property = property; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { Node child = property.getValueAsSingleReference(node); if (child != null) { ConcreteSyntaxModel.genericPrettyPrint(child, printer); @@ -46,7 +46,7 @@ public void prettyPrint(Node node, SourcePrinter printer) { } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmString.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmString.java index b35351b672..a05fdde5f9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmString.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmString.java @@ -24,27 +24,27 @@ import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.printer.SourcePrinter; -public class CsmString implements CsmElement { +public class CsmString implements CsmElement { private final ObservableProperty property; - public CsmString(ObservableProperty property) { + public CsmString(ObservableProperty property) { this.property = property; } - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { printer.print("\""); printer.print(property.getValueAsStringAttribute(node)); printer.print("\""); } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmTextBlock.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmTextBlock.java index e54758ed82..eb36259d20 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmTextBlock.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmTextBlock.java @@ -24,20 +24,20 @@ import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.printer.SourcePrinter; -public class CsmTextBlock implements CsmElement { +public class CsmTextBlock implements CsmElement { private final ObservableProperty property; - public CsmTextBlock(ObservableProperty property) { + public CsmTextBlock(ObservableProperty property) { this.property = property; } - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { printer.print("\"\"\""); // Per https://openjdk.java.net/jeps/378#1--Line-terminators, any 'CRLF' and 'CR' are turned into 'LF' before // interpreting the text @@ -48,7 +48,7 @@ public void prettyPrint(Node node, SourcePrinter printer) { } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), getProperty()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java index 35e2d94836..fa0e0b1acd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java @@ -22,7 +22,6 @@ import static com.github.javaparser.TokenTypes.isEndOfLineToken; import static com.github.javaparser.TokenTypes.isWhitespaceButNotEndOfLine; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.TokenTypes; import com.github.javaparser.ast.Node; @@ -31,21 +30,21 @@ import com.github.javaparser.printer.lexicalpreservation.TokenTextElement; import com.github.javaparser.utils.LineSeparator; -public class CsmToken implements CsmElement { +public class CsmToken implements CsmElement { private final int tokenType; private String content; - public int getTokenType() { + public int getTokenType() { return tokenType; } - public String getContent() { + public String getContent() { return content; } - public CsmToken(int tokenType) { + public CsmToken(int tokenType) { this.tokenType = tokenType; this.content = GeneratedJavaParserConstants.tokenImage[tokenType]; if (content.startsWith("\"")) { @@ -61,13 +60,13 @@ public CsmToken(int tokenType) { } } - public CsmToken(int tokenType, String content) { + public CsmToken(int tokenType, String content) { this.tokenType = tokenType; this.content = content; } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { if (isEndOfLineToken(tokenType)) { printer.println(); } else { @@ -76,36 +75,40 @@ public void prettyPrint(Node node, SourcePrinter printer) { } @Override - public String toString() { + public String toString() { return String.format("%s(property:%s)", this.getClass().getSimpleName(), content); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; CsmToken csmToken = (CsmToken) o; - if (tokenType != csmToken.tokenType) return false; - if (content != null ? !content.equals(csmToken.content) : csmToken.content != null) return false; + if (tokenType != csmToken.tokenType) + return false; + if (content != null ? !content.equals(csmToken.content) : csmToken.content != null) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { int result = tokenType; result = 31 * result + (content != null ? content.hashCode() : 0); return result; } - public boolean isWhiteSpace() { + public boolean isWhiteSpace() { return TokenTypes.isWhitespace(tokenType); } - public boolean isWhiteSpaceNotEol() { + public boolean isWhiteSpaceNotEol() { return isWhiteSpace() && !isNewLine(); } - public boolean isNewLine() { + public boolean isNewLine() { return TokenTypes.isEndOfLineToken(tokenType); } @@ -113,9 +116,7 @@ public boolean isNewLine() { * Verifies if the content of the {@code CsmElement} is the same as the provided {@code TextElement} */ @Override - public boolean isCorrespondingElement(TextElement textElement) { - return (textElement instanceof TokenTextElement) - && ((TokenTextElement) textElement).getTokenKind() == getTokenType() - && ((TokenTextElement) textElement).getText().equals(getContent()); + public boolean isCorrespondingElement(TextElement textElement) { + return (textElement instanceof TokenTextElement) && ((TokenTextElement) textElement).getTokenKind() == getTokenType() && ((TokenTextElement) textElement).getText().equals(getContent()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmUnindent.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmUnindent.java index db359ebbca..9f41819033 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmUnindent.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmUnindent.java @@ -23,20 +23,20 @@ import com.github.javaparser.ast.Node; import com.github.javaparser.printer.SourcePrinter; -public class CsmUnindent implements CsmElement { +public class CsmUnindent implements CsmElement { @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { printer.unindent(); } @Override - public int hashCode() { + public int hashCode() { return 2; } @Override - public boolean equals(Object obj) { + public boolean equals(Object obj) { return obj instanceof CsmUnindent; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ConfigurationOption.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ConfigurationOption.java index 136fb034fb..f5d8dfce8e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ConfigurationOption.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ConfigurationOption.java @@ -19,7 +19,7 @@ */ package com.github.javaparser.printer.configuration; -public interface ConfigurationOption { +public interface ConfigurationOption { /* * Set a currentValue to an option diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java index 4c9721e1c4..ba34749869 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java @@ -25,30 +25,32 @@ /* * An option is a pair of ConfigOption and a currentValue */ -public class DefaultConfigurationOption implements ConfigurationOption { +public class DefaultConfigurationOption implements ConfigurationOption { ConfigOption configOption; Object currentValue; - public DefaultConfigurationOption(ConfigOption configOption) { + public DefaultConfigurationOption(ConfigOption configOption) { this(configOption, null); } - public DefaultConfigurationOption(ConfigOption configOption, Object value) { + public DefaultConfigurationOption(ConfigOption configOption, Object value) { this.configOption = configOption; - if (value != null) value(value); + if (value != null) + value(value); } @Override - public boolean equals(Object o) { - if (o == null || !(o instanceof DefaultConfigurationOption)) return false; + public boolean equals(Object o) { + if (o == null || !(o instanceof DefaultConfigurationOption)) + return false; DefaultConfigurationOption other = (DefaultConfigurationOption) o; return configOption.equals(other.configOption); } @Override - public int hashCode() { + public int hashCode() { return configOption.hashCode(); } @@ -56,13 +58,12 @@ public int hashCode() { * Set a currentValue to an option */ @Override - public ConfigurationOption value(Object value) { + public ConfigurationOption value(Object value) { Utils.assertNotNull(value); this.currentValue = value; // verify the currentValue's type if (!(configOption.type.isAssignableFrom(value.getClass()))) { - throw new IllegalArgumentException( - String.format("%s is not an instance of %s", value, configOption.type.getName())); + throw new IllegalArgumentException(String.format("%s is not an instance of %s", value, configOption.type.getName())); } return this; } @@ -71,7 +72,7 @@ public ConfigurationOption value(Object value) { * returns True if the option has a currentValue */ @Override - public boolean hasValue() { + public boolean hasValue() { return this.currentValue != null; } @@ -79,7 +80,7 @@ public boolean hasValue() { * returns the currentValue as an Integer */ @Override - public Integer asInteger() { + public Integer asInteger() { return cast(); } @@ -87,7 +88,7 @@ public Integer asInteger() { * returns the currentValue as a String */ @Override - public String asString() { + public String asString() { return cast(); } @@ -95,12 +96,12 @@ public String asString() { * returns the currentValue as a Boolean */ @Override - public Boolean asBoolean() { + public Boolean asBoolean() { return cast(); } @Override - public T asValue() { + public T asValue() { return cast(); } @@ -109,7 +110,6 @@ private T cast() { throw new IllegalArgumentException(String.format("The option %s has no currentValue", configOption.name())); if (configOption.type.isAssignableFrom(currentValue.getClass())) return (T) configOption.type.cast(currentValue); - throw new IllegalArgumentException( - String.format("%s cannot be cast to %s", currentValue, configOption.type.getName())); + throw new IllegalArgumentException(String.format("%s cannot be cast to %s", currentValue, configOption.type.getName())); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java index 28501cde65..dd0aa0bb79 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java @@ -21,8 +21,8 @@ import com.github.javaparser.printer.Printer; import com.github.javaparser.printer.configuration.Indentation.IndentType; +import com.github.javaparser.utils.LineSeparator; import com.github.javaparser.utils.Utils; - import java.util.Arrays; import java.util.HashSet; import java.util.Optional; @@ -31,9 +31,9 @@ /** * Configuration options for the {@link Printer}. */ -public class DefaultPrinterConfiguration implements PrinterConfiguration { +public class DefaultPrinterConfiguration implements PrinterConfiguration { - public enum ConfigOption { + public enum ConfigOption { /** * Order imports alphabetically @@ -140,27 +140,16 @@ ConfigOption(Class clazz, T value) { // contains all available options // an option contained in the set is considered as activated - private Set defaultOptions = new HashSet<>(Arrays.asList( - new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS, ConfigOption.PRINT_COMMENTS.defaultValue), - new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC, ConfigOption.PRINT_JAVADOC.defaultValue), - new DefaultConfigurationOption( - ConfigOption.SPACE_AROUND_OPERATORS, ConfigOption.SPACE_AROUND_OPERATORS.defaultValue), - new DefaultConfigurationOption( - ConfigOption.INDENT_CASE_IN_SWITCH, ConfigOption.INDENT_CASE_IN_SWITCH.defaultValue), - new DefaultConfigurationOption( - ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, - ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY.defaultValue), - new DefaultConfigurationOption( - ConfigOption.END_OF_LINE_CHARACTER, ConfigOption.END_OF_LINE_CHARACTER.defaultValue), - new DefaultConfigurationOption(ConfigOption.INDENTATION, ConfigOption.INDENTATION.defaultValue))); + private Set defaultOptions = new HashSet<>(Arrays.asList(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS, ConfigOption.PRINT_COMMENTS.defaultValue), new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC, ConfigOption.PRINT_JAVADOC.defaultValue), new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS, ConfigOption.SPACE_AROUND_OPERATORS.defaultValue), new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH, ConfigOption.INDENT_CASE_IN_SWITCH.defaultValue), new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY.defaultValue), new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, ConfigOption.END_OF_LINE_CHARACTER.defaultValue), new DefaultConfigurationOption(ConfigOption.INDENTATION, ConfigOption.INDENTATION.defaultValue))); - public DefaultPrinterConfiguration() {} + public DefaultPrinterConfiguration() { + } /* * add the specified option if it does not exist or replace the existing option */ @Override - public PrinterConfiguration addOption(ConfigurationOption option) { + public PrinterConfiguration addOption(ConfigurationOption option) { removeOption(option); defaultOptions.add(option); return this; @@ -170,7 +159,7 @@ public PrinterConfiguration addOption(ConfigurationOption option) { * remove the specified option */ @Override - public PrinterConfiguration removeOption(ConfigurationOption option) { + public PrinterConfiguration removeOption(ConfigurationOption option) { defaultOptions.remove(option); return this; } @@ -179,7 +168,7 @@ public PrinterConfiguration removeOption(ConfigurationOption option) { * True if an option is activated */ @Override - public boolean isActivated(ConfigurationOption option) { + public boolean isActivated(ConfigurationOption option) { return defaultOptions.contains(option); } @@ -187,7 +176,7 @@ public boolean isActivated(ConfigurationOption option) { * returns the specified option */ @Override - public Optional get(ConfigurationOption option) { + public Optional get(ConfigurationOption option) { return defaultOptions.stream().filter(o -> o.equals(option)).findFirst(); } @@ -195,7 +184,7 @@ public Optional get(ConfigurationOption option) { * returns all options configured */ @Override - public Set get() { + public Set get() { return defaultOptions; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ImportOrderingStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ImportOrderingStrategy.java index fda8c0c837..b4c6d8b46f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ImportOrderingStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/ImportOrderingStrategy.java @@ -23,7 +23,7 @@ import com.github.javaparser.ast.NodeList; import java.util.List; -public interface ImportOrderingStrategy { +public interface ImportOrderingStrategy { /** * Sort the list of imports into groups. diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/Indentation.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/Indentation.java index 42b91a39fa..55f8924820 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/Indentation.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/Indentation.java @@ -22,9 +22,9 @@ /** * This class defines the characteristics of an indentation: the type (space, tabs..) and the size (How many characters must be used to indent the code). */ -public class Indentation { +public class Indentation { - public enum IndentType { + public enum IndentType { /** * Indent with spaces. @@ -67,11 +67,11 @@ private IndentType(Character c, int width) { this.width = width; } - public Character getCar() { + public Character getCar() { return car; } - public int getWidth() { + public int getWidth() { return width; } } @@ -91,7 +91,7 @@ public int getWidth() { /* * Creates an Indentation with a type and size */ - public Indentation(IndentType type, int size) { + public Indentation(IndentType type, int size) { this.type = type; this.size = size; format(); @@ -100,40 +100,40 @@ public Indentation(IndentType type, int size) { /* * Creates an Indentation with the default size */ - public Indentation(IndentType type) { + public Indentation(IndentType type) { this(type, DEFAULT_SIZE); } /* * set the size of the indentation (how many spaces or tabs?) */ - public Indentation setSize(int size) { + public Indentation setSize(int size) { this.size = size; format(); return this; } - public int getSize() { + public int getSize() { return size; } /* * set the type of the indentation (spaces, tabs...) */ - public Indentation setType(IndentType type) { + public Indentation setType(IndentType type) { this.type = type; format(); return this; } - public IndentType getType() { + public IndentType getType() { return type; } /* * returns the formatted string that represents the identification */ - public String getIndent() { + public String getIndent() { return formattedIndentation; } @@ -148,7 +148,7 @@ private void format() { } @Override - public String toString() { + public String toString() { return type.name() + " size=" + size; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java index 1c9551b58e..2457317d3d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java @@ -23,10 +23,8 @@ import com.github.javaparser.printer.PrettyPrinter; import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption; import com.github.javaparser.printer.configuration.Indentation.IndentType; - import java.util.Optional; import java.util.Set; - import static com.github.javaparser.utils.Utils.*; /** @@ -34,31 +32,28 @@ * This class is no longer acceptable to use because it is not sufficiently configurable and it is too tied to a specific implementation *

    Use {@link PrinterConfiguration interface or DefaultPrinterConfiguration default implementation } instead. * - * @deprecated This class could be removed in a future version. Use default DefaultPrinterConfiguration. + * @deprecated This class could be removed in a future version. Use defaultPrinterConfiguration. */ @Deprecated -public class PrettyPrinterConfiguration implements PrinterConfiguration { +public class PrettyPrinterConfiguration implements PrinterConfiguration { PrinterConfiguration wrappedConfiguration; /* * Default constructor */ - public PrettyPrinterConfiguration() { + public PrettyPrinterConfiguration() { this.wrappedConfiguration = new DefaultPrinterConfiguration(); } /* * returns the indentation parameters */ - public Indentation getIndentation() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.INDENTATION)) - .get() - .asValue(); + public Indentation getIndentation() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.INDENTATION)).get().asValue(); } - public PrettyPrinterConfiguration setIndentation(Indentation indentation) { + public PrettyPrinterConfiguration setIndentation(Indentation indentation) { wrappedConfiguration.addOption(new DefaultConfigurationOption(ConfigOption.INDENTATION, indentation)); return this; } @@ -68,7 +63,7 @@ public PrettyPrinterConfiguration setIndentation(Indentation indentation) { * @deprecated (@ see Indentation.getIndent ()) */ @Deprecated - public String getIndent() { + public String getIndent() { return getIndentation().getIndent(); } @@ -77,7 +72,7 @@ public String getIndent() { * @deprecated (@ see Indentation.size) */ @Deprecated - public int getIndentSize() { + public int getIndentSize() { return getIndentation().getSize(); } @@ -87,7 +82,7 @@ public int getIndentSize() { * @deprecated (@ see Indentation.size ()) */ @Deprecated - public PrettyPrinterConfiguration setIndentSize(int indentSize) { + public PrettyPrinterConfiguration setIndentSize(int indentSize) { Indentation indentation = getIndentation().setSize(assertNonNegative(indentSize)); setIndentation(indentation); return this; @@ -99,7 +94,7 @@ public PrettyPrinterConfiguration setIndentSize(int indentSize) { * @deprecated (@ see Indentation.type) */ @Deprecated - public IndentType getIndentType() { + public IndentType getIndentType() { return getIndentation().getType(); } @@ -109,7 +104,7 @@ public IndentType getIndentType() { * @deprecated (@ see Indentation.type ()) */ @Deprecated - public PrettyPrinterConfiguration setIndentType(IndentType indentType) { + public PrettyPrinterConfiguration setIndentType(IndentType indentType) { Indentation indentation = getIndentation().setType(assertNotNull(indentType)); setIndentation(indentation); return this; @@ -121,7 +116,7 @@ public PrettyPrinterConfiguration setIndentType(IndentType indentType) { * @deprecated (@ see Indentation.size) */ @Deprecated - public int getTabWidth() { + public int getTabWidth() { return getIndentation().getSize(); } @@ -131,122 +126,91 @@ public int getTabWidth() { * @deprecated (@ see Indentation.size) */ @Deprecated - public PrettyPrinterConfiguration setTabWidth(int tabWidth) { + public PrettyPrinterConfiguration setTabWidth(int tabWidth) { setIndentSize(assertPositive(tabWidth)); return this; } - public boolean isOrderImports() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)) - .isPresent(); + public boolean isOrderImports() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)).isPresent(); } - public boolean isPrintComments() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)) - .isPresent(); + public boolean isPrintComments() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)).isPresent(); } - public boolean isIgnoreComments() { - return !wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)) - .isPresent(); + public boolean isIgnoreComments() { + return !wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)).isPresent(); } - public boolean isSpaceAroundOperators() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)) - .isPresent(); + public boolean isSpaceAroundOperators() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)).isPresent(); } - public boolean isPrintJavadoc() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)) - .isPresent(); + public boolean isPrintJavadoc() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)).isPresent(); } - public boolean isColumnAlignParameters() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)) - .isPresent(); + public boolean isColumnAlignParameters() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)).isPresent(); } - public boolean isColumnAlignFirstMethodChain() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)) - .isPresent(); + public boolean isColumnAlignFirstMethodChain() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)).isPresent(); } - public boolean isIndentCaseInSwitch() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)) - .isPresent(); + public boolean isIndentCaseInSwitch() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)).isPresent(); } /** * When true, all comments will be printed, unless printJavadoc is false, then only line and block comments will be * printed. */ - public PrettyPrinterConfiguration setPrintComments(boolean printComments) { - wrappedConfiguration = printComments - ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)) - : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)); + public PrettyPrinterConfiguration setPrintComments(boolean printComments) { + wrappedConfiguration = printComments ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)) : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)); return this; } /** * When true, Javadoc will be printed. */ - public PrettyPrinterConfiguration setPrintJavadoc(boolean printJavadoc) { - wrappedConfiguration = printJavadoc - ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)) - : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)); + public PrettyPrinterConfiguration setPrintJavadoc(boolean printJavadoc) { + wrappedConfiguration = printJavadoc ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)) : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)); return this; } /** * Set if there should be spaces between operators */ - public PrettyPrinterConfiguration setSpaceAroundOperators(boolean spaceAroundOperators) { - wrappedConfiguration = spaceAroundOperators - ? addOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)) - : removeOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)); + public PrettyPrinterConfiguration setSpaceAroundOperators(boolean spaceAroundOperators) { + wrappedConfiguration = spaceAroundOperators ? addOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)) : removeOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)); return this; } - public PrettyPrinterConfiguration setColumnAlignParameters(boolean columnAlignParameters) { - wrappedConfiguration = columnAlignParameters - ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)) - : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)); + public PrettyPrinterConfiguration setColumnAlignParameters(boolean columnAlignParameters) { + wrappedConfiguration = columnAlignParameters ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)) : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)); return this; } - public PrettyPrinterConfiguration setColumnAlignFirstMethodChain(boolean columnAlignFirstMethodChain) { - wrappedConfiguration = columnAlignFirstMethodChain - ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)) - : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)); + public PrettyPrinterConfiguration setColumnAlignFirstMethodChain(boolean columnAlignFirstMethodChain) { + wrappedConfiguration = columnAlignFirstMethodChain ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)) : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)); return this; } - public PrettyPrinterConfiguration setIndentCaseInSwitch(boolean indentInSwitch) { - wrappedConfiguration = indentInSwitch - ? addOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)) - : removeOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)); + public PrettyPrinterConfiguration setIndentCaseInSwitch(boolean indentInSwitch) { + wrappedConfiguration = indentInSwitch ? addOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)) : removeOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)); return this; } - public String getEndOfLineCharacter() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)) - .get() - .asValue(); + public String getEndOfLineCharacter() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)).get().asValue(); } /** * Set the character to append when a line should end. Example values: "\n", "\r\n", "". */ - public PrettyPrinterConfiguration setEndOfLineCharacter(String endOfLineCharacter) { + public PrettyPrinterConfiguration setEndOfLineCharacter(String endOfLineCharacter) { addOption(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, endOfLineCharacter)); return this; } @@ -254,18 +218,13 @@ public PrettyPrinterConfiguration setEndOfLineCharacter(String endOfLineCharacte /** * When true, orders imports by alphabetically. */ - public PrettyPrinterConfiguration setOrderImports(boolean orderImports) { - wrappedConfiguration = orderImports - ? addOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)) - : removeOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)); + public PrettyPrinterConfiguration setOrderImports(boolean orderImports) { + wrappedConfiguration = orderImports ? addOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)) : removeOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)); return this; } - public int getMaxEnumConstantsToAlignHorizontally() { - return wrappedConfiguration - .get(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY)) - .get() - .asInteger(); + public int getMaxEnumConstantsToAlignHorizontally() { + return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY)).get().asInteger(); } /** @@ -291,34 +250,33 @@ public int getMaxEnumConstantsToAlignHorizontally() { * Set it to a large number to always align horizontally. * Set it to 1 or less to always align vertically. */ - public PrettyPrinterConfiguration setMaxEnumConstantsToAlignHorizontally(int maxEnumConstantsToAlignHorizontally) { - addOption(new DefaultConfigurationOption( - ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, maxEnumConstantsToAlignHorizontally)); + public PrettyPrinterConfiguration setMaxEnumConstantsToAlignHorizontally(int maxEnumConstantsToAlignHorizontally) { + addOption(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, maxEnumConstantsToAlignHorizontally)); return this; } @Override - public PrinterConfiguration addOption(ConfigurationOption option) { + public PrinterConfiguration addOption(ConfigurationOption option) { return wrappedConfiguration.addOption(option); } @Override - public boolean isActivated(ConfigurationOption option) { + public boolean isActivated(ConfigurationOption option) { return wrappedConfiguration.isActivated(option); } @Override - public Optional get(ConfigurationOption option) { + public Optional get(ConfigurationOption option) { return wrappedConfiguration.get(option); } @Override - public Set get() { + public Set get() { return wrappedConfiguration.get(); } @Override - public PrinterConfiguration removeOption(ConfigurationOption option) { + public PrinterConfiguration removeOption(ConfigurationOption option) { return wrappedConfiguration.removeOption(option); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrinterConfiguration.java index 48f0e17c60..544a0f429e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrinterConfiguration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrinterConfiguration.java @@ -26,7 +26,7 @@ * This interface defines the API for printer configuration. * An option can be added or removed from the configuration. An indentation can also be added to it. */ -public interface PrinterConfiguration { +public interface PrinterConfiguration { /* * add or update an option diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java index b2a7eaa1ec..f1402570d0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java @@ -23,19 +23,17 @@ import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.nodeTypes.NodeWithName; import com.github.javaparser.printer.configuration.ImportOrderingStrategy; - import java.util.Collections; import java.util.Comparator; import java.util.List; - import static java.util.Comparator.comparingInt; -public class DefaultImportOrderingStrategy implements ImportOrderingStrategy { +public class DefaultImportOrderingStrategy implements ImportOrderingStrategy { private boolean sortImportsAlphabetically = false; @Override - public List> sortImports(NodeList nodes) { + public List> sortImports(NodeList nodes) { if (sortImportsAlphabetically) { Comparator sortLogic = comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1).thenComparing(NodeWithName::getNameAsString); nodes.sort(sortLogic); @@ -44,12 +42,12 @@ public List> sortImports(NodeList } @Override - public void setSortImportsAlphabetically(boolean sortImportsAlphabetically) { + public void setSortImportsAlphabetically(boolean sortImportsAlphabetically) { this.sortImportsAlphabetically = sortImportsAlphabetically; } @Override - public boolean isSortImportsAlphabetically() { + public boolean isSortImportsAlphabetically() { return sortImportsAlphabetically; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/EclipseImportOrderingStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/EclipseImportOrderingStrategy.java index 287d217499..80c2371349 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/EclipseImportOrderingStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/EclipseImportOrderingStrategy.java @@ -27,12 +27,12 @@ import java.util.Comparator; import java.util.List; -public class EclipseImportOrderingStrategy implements ImportOrderingStrategy { +public class EclipseImportOrderingStrategy implements ImportOrderingStrategy { private boolean sortImportsAlphabetically = false; @Override - public List> sortImports(NodeList nodes) { + public List> sortImports(NodeList nodes) { NodeList staticImports = new NodeList<>(); NodeList javaImports = new NodeList<>(); NodeList javaXImports = new NodeList<>(); @@ -71,12 +71,12 @@ public List> sortImports(NodeList } @Override - public void setSortImportsAlphabetically(boolean sortAlphabetically) { + public void setSortImportsAlphabetically(boolean sortAlphabetically) { sortImportsAlphabetically = sortAlphabetically; } @Override - public boolean isSortImportsAlphabetically() { + public boolean isSortImportsAlphabetically() { return sortImportsAlphabetically; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/IntelliJImportOrderingStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/IntelliJImportOrderingStrategy.java index 27debbc09e..f6d691856e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/IntelliJImportOrderingStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/IntelliJImportOrderingStrategy.java @@ -27,12 +27,12 @@ import java.util.Comparator; import java.util.List; -public class IntelliJImportOrderingStrategy implements ImportOrderingStrategy { +public class IntelliJImportOrderingStrategy implements ImportOrderingStrategy { private boolean sortImportsAlphabetically = false; @Override - public List> sortImports(NodeList nodes) { + public List> sortImports(NodeList nodes) { NodeList otherImports = new NodeList<>(); NodeList javaImports = new NodeList<>(); NodeList staticImports = new NodeList<>(); @@ -59,12 +59,12 @@ public List> sortImports(NodeList } @Override - public void setSortImportsAlphabetically(boolean sortAlphabetically) { + public void setSortImportsAlphabetically(boolean sortAlphabetically) { sortImportsAlphabetically = sortAlphabetically; } @Override - public boolean isSortImportsAlphabetically() { + public boolean isSortImportsAlphabetically() { return sortImportsAlphabetically; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java index 9110da75f4..4e6786716f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java @@ -25,7 +25,7 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmToken; import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent; -public class Added implements DifferenceElement { +public class Added implements DifferenceElement { private final CsmElement element; @@ -34,48 +34,50 @@ public class Added implements DifferenceElement { } @Override - public String toString() { + public String toString() { return "Added{" + element + '}'; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Added added = (Added) o; return element.equals(added.element); } @Override - public int hashCode() { + public int hashCode() { return element.hashCode(); } @Override - public CsmElement getElement() { + public CsmElement getElement() { return element; } @Override - public boolean isAdded() { + public boolean isAdded() { return true; } @Override - public boolean isRemoved() { + public boolean isRemoved() { return false; } @Override - public boolean isKept() { + public boolean isKept() { return false; } - public boolean isIndent() { + public boolean isIndent() { return element instanceof CsmIndent; } - public boolean isUnindent() { + public boolean isUnindent() { return element instanceof CsmUnindent; } @@ -83,15 +85,14 @@ private boolean isToken() { return element instanceof CsmToken; } - public TextElement toTextElement() { + public TextElement toTextElement() { if (element instanceof LexicalDifferenceCalculator.CsmChild) { return new ChildTextElement(((LexicalDifferenceCalculator.CsmChild) element).getChild()); } if (element instanceof CsmToken) { return new TokenTextElement(((CsmToken) element).getTokenType(), ((CsmToken) element).getContent()); } - throw new UnsupportedOperationException( - "Unsupported element type: " + element.getClass().getSimpleName()); + throw new UnsupportedOperationException("Unsupported element type: " + element.getClass().getSimpleName()); } /* @@ -99,14 +100,14 @@ public TextElement toTextElement() { * with the specified line separator. The line separator parameter must be a CsmToken with a valid line separator. */ @Override - public DifferenceElement replaceEolTokens(CsmElement lineSeparator) { + public DifferenceElement replaceEolTokens(CsmElement lineSeparator) { return isNewLine() ? new Added(lineSeparator) : this; } /* * Return true if the wrapped {@code CsmElement} is a new line token */ - public boolean isNewLine() { + public boolean isNewLine() { return isToken() && ((CsmToken) element).isNewLine(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java index b930daa1e3..2c360ea243 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java @@ -28,7 +28,7 @@ /** * Represent the position of a child node in the NodeText of its parent. */ -public class ChildTextElement extends TextElement { +public class ChildTextElement extends TextElement { private final Node child; @@ -37,21 +37,21 @@ public class ChildTextElement extends TextElement { } @Override - public String expand() { + public String expand() { return LexicalPreservingPrinter.print(child); } - public Node getChild() { + public Node getChild() { return child; } @Override - public boolean isToken(int tokenKind) { + public boolean isToken(int tokenKind) { return false; } @Override - public boolean isNode(Node node) { + public boolean isNode(Node node) { return node == child; } @@ -60,70 +60,72 @@ NodeText getNodeTextForWrappedNode() { } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; ChildTextElement that = (ChildTextElement) o; return child.equals(that.child); } @Override - public int hashCode() { + public int hashCode() { return child.hashCode(); } @Override - public String toString() { + public String toString() { return "ChildTextElement{" + child + '}'; } @Override - public boolean isWhiteSpace() { + public boolean isWhiteSpace() { return false; } @Override - public boolean isSpaceOrTab() { + public boolean isSpaceOrTab() { return false; } @Override - public boolean isNewline() { + public boolean isNewline() { return false; } @Override - public boolean isComment() { + public boolean isComment() { return child instanceof Comment; } @Override - public boolean isSeparator() { + public boolean isSeparator() { return false; } @Override - public boolean isIdentifier() { + public boolean isIdentifier() { return false; } @Override - public boolean isKeyword() { + public boolean isKeyword() { return false; } @Override - public boolean isPrimitive() { + public boolean isPrimitive() { return false; } @Override - public boolean isLiteral() { + public boolean isLiteral() { return false; } @Override - public boolean isChildOfClass(Class nodeClass) { + public boolean isChildOfClass(Class nodeClass) { return nodeClass.isInstance(child); } @@ -133,7 +135,7 @@ Optional getRange() { } @Override - public void accept(LexicalPreservingVisitor visitor) { + public void accept(LexicalPreservingVisitor visitor) { NodeText nodeText = getNodeTextForWrappedNode(); nodeText.getElements().forEach(element -> element.accept(visitor)); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java index 063fbb5ea4..5c064cecef 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java @@ -23,7 +23,6 @@ import static com.github.javaparser.GeneratedJavaParserConstants.LBRACE; import static com.github.javaparser.GeneratedJavaParserConstants.RBRACE; import static com.github.javaparser.GeneratedJavaParserConstants.SPACE; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.JavaToken; import com.github.javaparser.JavaToken.Kind; @@ -49,7 +48,7 @@ * * I should later be able to apply such difference to a nodeText. */ -public class Difference { +public class Difference { public static final int STANDARD_INDENTATION_SIZE = 4; @@ -86,10 +85,10 @@ public class Difference { List processIndentation(List indentation, List prevElements) { int eolIndex = lastIndexOfEol(prevElements); // Return "indentation" as is if no EOL element was found - if (eolIndex < 0) return indentation; + if (eolIndex < 0) + return indentation; // Find consecutive space characters after the EOL element - indentation = - takeWhile(prevElements.subList(eolIndex + 1, prevElements.size()), element -> element.isWhiteSpace()); + indentation = takeWhile(prevElements.subList(eolIndex + 1, prevElements.size()), element -> element.isWhiteSpace()); return indentation; } @@ -111,11 +110,7 @@ List takeWhile(List prevElements, Predicate source) { - return IntStream.range(0, source.size()) - .map(i -> source.size() - i - 1) - .filter(i -> source.get(i).isNewline()) - .findFirst() - .orElse(-1); + return IntStream.range(0, source.size()).map(i -> source.size() - i - 1).filter(i -> source.get(i).isNewline()).findFirst().orElse(-1); } /* @@ -123,7 +118,8 @@ int lastIndexOfEol(List source) { * or -1 if it's not a comment. */ private int posOfNextComment(int fromIndex, List elements) { - if (!isValidIndex(fromIndex, elements)) return -1; + if (!isValidIndex(fromIndex, elements)) + return -1; ArrayIterator iterator = new ArrayIterator<>(elements, fromIndex); // search for the next consecutive space characters while (iterator.hasNext()) { @@ -150,7 +146,8 @@ private boolean isFollowedByComment(int fromIndex, List elements) { * Removes all elements in the list starting from @{code fromIndex}) ending to @{code toIndex}) */ private void removeElements(int fromIndex, int toIndex, List elements) { - if (!(isValidIndex(fromIndex, elements) && isValidIndex(toIndex, elements) && fromIndex <= toIndex)) return; + if (!(isValidIndex(fromIndex, elements) && isValidIndex(toIndex, elements) && fromIndex <= toIndex)) + return; ListIterator iterator = elements.listIterator(fromIndex); // removing elements int count = fromIndex; @@ -224,14 +221,11 @@ private int considerRemovingIndentation(NodeText nodeText, int nodeTextIndex) { } private int considerIndentation(NodeText nodeText, int nodeTextIndex, int numberOfCharactersToPreserve) { - EnforcingIndentationContext enforcingIndentationContext = - defineEnforcingIndentationContext(nodeText, nodeTextIndex); + EnforcingIndentationContext enforcingIndentationContext = defineEnforcingIndentationContext(nodeText, nodeTextIndex); // the next position in the list (by default the current position) int res = nodeTextIndex; if (enforcingIndentationContext.extraCharacters > 0) { - int extraCharacters = enforcingIndentationContext.extraCharacters > numberOfCharactersToPreserve - ? enforcingIndentationContext.extraCharacters - numberOfCharactersToPreserve - : 0; + int extraCharacters = enforcingIndentationContext.extraCharacters > numberOfCharactersToPreserve ? enforcingIndentationContext.extraCharacters - numberOfCharactersToPreserve : 0; res = removeExtraCharacters(nodeText, enforcingIndentationContext.start, extraCharacters); // The next position must take into account the indentation res = extraCharacters > 0 ? res + numberOfCharactersToPreserve : res; @@ -243,17 +237,11 @@ private int considerIndentation(NodeText nodeText, int nodeTextIndex, int number } private boolean isEnforcingIndentationActivable(RemovedGroup removedGroup) { - return (isLastElement(diffElements, diffIndex) - || !(nextDiffElement(diffElements, diffIndex).isAdded())) - && originalIndex < originalElements.size() - && !removedGroup.isACompleteLine(); + return (isLastElement(diffElements, diffIndex) || !(nextDiffElement(diffElements, diffIndex).isAdded())) && originalIndex < originalElements.size() && !removedGroup.isACompleteLine(); } private boolean isRemovingIndentationActivable(RemovedGroup removedGroup) { - return (isLastElement(diffElements, diffIndex) - || !(nextDiffElement(diffElements, diffIndex).isAdded())) - && originalIndex < originalElements.size() - && removedGroup.isACompleteLine(); + return (isLastElement(diffElements, diffIndex) || !(nextDiffElement(diffElements, diffIndex).isAdded())) && originalIndex < originalElements.size() && removedGroup.isACompleteLine(); } private boolean isLastElement(List list, int index) { @@ -274,11 +262,11 @@ private class EnforcingIndentationContext { int extraCharacters; - public EnforcingIndentationContext(int start) { + public EnforcingIndentationContext(int start) { this(start, 0); } - public EnforcingIndentationContext(int start, int extraCharacters) { + public EnforcingIndentationContext(int start, int extraCharacters) { this.start = start; this.extraCharacters = extraCharacters; } @@ -386,20 +374,12 @@ void apply() { boolean originalElementIsChild = originalElement instanceof ChildTextElement; boolean originalElementIsToken = originalElement instanceof TokenTextElement; if (diffElement.isKept()) { - applyKeptDiffElement( - (Kept) diffElement, originalElement, originalElementIsChild, originalElementIsToken); + applyKeptDiffElement((Kept) diffElement, originalElement, originalElementIsChild, originalElementIsToken); } else if (diffElement.isRemoved()) { Removed removed = (Removed) diffElement; - applyRemovedDiffElement( - removedGroups.get(removed), - removed, - originalElement, - originalElementIsChild, - originalElementIsToken); + applyRemovedDiffElement(removedGroups.get(removed), removed, originalElement, originalElementIsChild, originalElementIsToken); } else { - throw new UnsupportedOperationException("Unable to apply operations from " - + diffElement.getClass().getSimpleName() + " to " - + originalElement.getClass().getSimpleName()); + throw new UnsupportedOperationException("Unable to apply operations from " + diffElement.getClass().getSimpleName() + " to " + originalElement.getClass().getSimpleName()); } } } @@ -413,8 +393,7 @@ private boolean applyLeftOverOriginalElements() { if (originalElement.isWhiteSpaceOrComment()) { originalIndex++; } else { - throw new UnsupportedOperationException( - "NodeText: " + nodeText + ". Difference: " + this + " " + originalElement); + throw new UnsupportedOperationException("NodeText: " + nodeText + ". Difference: " + this + " " + originalElement); } isLeftOverElement = true; } @@ -478,9 +457,7 @@ private Map> groupConsecutiveRemovedElements() { if (firstElement == null) { firstElement = i; } - removedElementsMap - .computeIfAbsent(firstElement, key -> new ArrayList<>()) - .add((Removed) diffElement); + removedElementsMap.computeIfAbsent(firstElement, key -> new ArrayList<>()).add((Removed) diffElement); } else { firstElement = null; } @@ -488,21 +465,14 @@ private Map> groupConsecutiveRemovedElements() { return removedElementsMap; } - private void applyRemovedDiffElement( - RemovedGroup removedGroup, - Removed removed, - TextElement originalElement, - boolean originalElementIsChild, - boolean originalElementIsToken) { + private void applyRemovedDiffElement(RemovedGroup removedGroup, Removed removed, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) { if (removed.isChild() && originalElementIsChild) { ChildTextElement originalElementChild = (ChildTextElement) originalElement; if (originalElementChild.isComment()) { // We expected to remove a proper node but we found a comment in between. // If the comment is associated to the node we want to remove we remove it as well, otherwise we keep it Comment comment = (Comment) originalElementChild.getChild(); - if (!comment.isOrphan() - && comment.getCommentedNode().isPresent() - && comment.getCommentedNode().get().equals(removed.getChild())) { + if (!comment.isOrphan() && comment.getCommentedNode().isPresent() && comment.getCommentedNode().get().equals(removed.getChild())) { nodeText.removeElement(originalIndex); } else { originalIndex++; @@ -524,12 +494,9 @@ private void applyRemovedDiffElement( // The token corresponding to the annotation is the first element of the annotation node // and it is also the first element of the parent node (MethodDeclaration), // so the previous indentation is defined in the parent node of the method declaration. - if (!parentNodeText.getElements().isEmpty() - && parentNode.getParentNode().isPresent() - && parentNodeText.getTextElement(0).equals(nodeText.getTextElement(originalIndex))) { + if (!parentNodeText.getElements().isEmpty() && parentNode.getParentNode().isPresent() && parentNodeText.getTextElement(0).equals(nodeText.getTextElement(originalIndex))) { startingNodeForFindingIndentation = parentNode; - parentNodeText = LexicalPreservingPrinter.getOrCreateNodeText( - parentNode.getParentNode().get()); + parentNodeText = LexicalPreservingPrinter.getOrCreateNodeText(parentNode.getParentNode().get()); } indentationTokens = LexicalPreservingPrinter.findIndentation(startingNodeForFindingIndentation); } @@ -545,14 +512,12 @@ private void applyRemovedDiffElement( } // If in front we have one space and before also we had space let's drop one space if (originalElements.size() > originalIndex && originalIndex > 0) { - if (originalElements.get(originalIndex).isWhiteSpace() - && originalElements.get(originalIndex - 1).isWhiteSpace()) { + if (originalElements.get(originalIndex).isWhiteSpace() && originalElements.get(originalIndex - 1).isWhiteSpace()) { // However we do not want to do that when we are about to adding or removing elements // The intention is not very clear maybe it should clarify this with examples! // Are we to understand that we can only do this if there is a single modification to process // OR or if the next change is to keep the element - if ((diffIndex + 1) == diffElements.size() - || (diffElements.get(diffIndex + 1).isKept())) { + if ((diffIndex + 1) == diffElements.size() || (diffElements.get(diffIndex + 1).isKept())) { originalElements.remove(originalIndex--); } } @@ -576,8 +541,7 @@ private void applyRemovedDiffElement( // the same line as a method declaration. if (originalIndex == 0 && !indentationTokens.isEmpty() && !isInlined(nodeText, originalIndex)) { for (TextElement indentationToken : indentationTokens) { - parentNodeText.removeElement( - parentNodeText.findElement(indentationToken.and(indentationToken.matchByRange()))); + parentNodeText.removeElement(parentNodeText.findElement(indentationToken.and(indentationToken.matchByRange()))); } } } @@ -589,23 +553,13 @@ private void applyRemovedDiffElement( if (isRemovingIndentationActivable(removedGroup)) { originalIndex = considerRemovingIndentation(nodeText, originalIndex); } - } else if (removed.isToken() - && originalElementIsToken - && (removed.getTokenType() == ((TokenTextElement) originalElement).getTokenKind() - || // handle EOLs separately as their token kind might not be equal. This is because the - // 'removed' - // element always has the current operating system's EOL as type - (((TokenTextElement) originalElement) - .getToken() - .getCategory() - .isEndOfLine() - && removed.isNewLine()))) { + } else if (removed.isToken() && originalElementIsToken && (removed.getTokenType() == ((TokenTextElement) originalElement).getTokenKind() || // handle EOLs separately as their token kind might not be equal. This is because the + // 'removed' + // element always has the current operating system's EOL as type + (((TokenTextElement) originalElement).getToken().getCategory().isEndOfLine() && removed.isNewLine()))) { nodeText.removeElement(originalIndex); diffIndex++; - } else if ((removed.isWhiteSpaceNotEol() - || removed.getElement() instanceof CsmIndent - || removed.getElement() instanceof CsmUnindent) - && originalElement.isSpaceOrTab()) { + } else if ((removed.isWhiteSpaceNotEol() || removed.getElement() instanceof CsmIndent || removed.getElement() instanceof CsmUnindent) && originalElement.isSpaceOrTab()) { // remove the current space nodeText.removeElement(originalIndex); } else if (originalElementIsToken && originalElement.isWhiteSpaceOrComment()) { @@ -624,9 +578,7 @@ private void applyRemovedDiffElement( } else { throw new UnsupportedOperationException("removed " + removed.getElement() + " vs " + originalElement); } - } else if (removed.isWhiteSpace() - || removed.getElement() instanceof CsmIndent - || removed.getElement() instanceof CsmUnindent) { + } else if (removed.isWhiteSpace() || removed.getElement() instanceof CsmIndent || removed.getElement() instanceof CsmUnindent) { diffIndex++; } else if (originalElement.isWhiteSpace()) { originalIndex++; @@ -650,10 +602,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo } // we dont want to remove the indentation if the last removed element is a newline // because in this case we are trying to remove the indentation of the next child element - if (!removedGroup.isProcessed() - && removedGroup.isLastElement(removed) - && removedGroup.isACompleteLine() - && !removed.isNewLine()) { + if (!removedGroup.isProcessed() && removedGroup.isLastElement(removed) && removedGroup.isACompleteLine() && !removed.isNewLine()) { Integer lastElementIndex = removedGroup.getLastElementIndex(); Optional indentation = removedGroup.getIndentation(); if (indentation.isPresent() && !isReplaced(lastElementIndex)) { @@ -661,8 +610,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo if (originalElements.get(originalIndex).isSpaceOrTab()) { // If the current element is a space, remove it nodeText.removeElement(originalIndex); - } else if (originalIndex >= 1 - && originalElements.get(originalIndex - 1).isSpaceOrTab()) { + } else if (originalIndex >= 1 && originalElements.get(originalIndex - 1).isSpaceOrTab()) { // If the current element is not a space itself we remove the space in front of (before) it nodeText.removeElement(originalIndex - 1); originalIndex--; @@ -682,8 +630,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo // note: // increment originalIndex if we want to keep the original element // increment diffIndex if we want to skip the diff element - private void applyKeptDiffElement( - Kept kept, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) { + private void applyKeptDiffElement(Kept kept, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) { if (originalElement.isComment()) { originalIndex++; } else if (kept.isChild() && ((CsmChild) kept.getElement()).getChild() instanceof Comment) { @@ -721,8 +668,7 @@ private void applyKeptDiffElement( // positioning on the next token originalIndex++; } else if ((originalElement.isIdentifier() || originalElement.isKeyword()) && isArrayType(kept)) { - int tokenToSkip = - getIndexToNextTokenElementInArrayType((TokenTextElement) originalElement, getArrayLevel(kept)); + int tokenToSkip = getIndexToNextTokenElementInArrayType((TokenTextElement) originalElement, getArrayLevel(kept)); diffIndex++; originalIndex += tokenToSkip; originalIndex++; @@ -756,8 +702,7 @@ private void applyKeptDiffElement( // see issue 2351 originalIndex++; } else { - throw new UnsupportedOperationException( - "Csm token " + kept.getElement() + " NodeText TOKEN " + originalTextToken); + throw new UnsupportedOperationException("Csm token " + kept.getElement() + " NodeText TOKEN " + originalTextToken); } } else if (kept.isToken() && originalElementIsChild) { diffIndex++; @@ -790,17 +735,18 @@ private int getArrayLevel(DifferenceElement element) { */ private boolean isArrayType(DifferenceElement element) { CsmElement csmElem = element.getElement(); - return csmElem instanceof LexicalDifferenceCalculator.CsmChild - && ((LexicalDifferenceCalculator.CsmChild) csmElem).getChild() instanceof ArrayType; + return csmElem instanceof LexicalDifferenceCalculator.CsmChild && ((LexicalDifferenceCalculator.CsmChild) csmElem).getChild() instanceof ArrayType; } /* * Returns true if the DifferenceElement is a CsmChild which represents a type with fully qualified name */ private boolean isTypeWithFullyQualifiedName(DifferenceElement element) { - if (!element.isChild()) return false; + if (!element.isChild()) + return false; CsmChild child = (CsmChild) element.getElement(); - if (!ClassOrInterfaceType.class.isAssignableFrom(child.getChild().getClass())) return false; + if (!ClassOrInterfaceType.class.isAssignableFrom(child.getChild().getClass())) + return false; return ((ClassOrInterfaceType) child.getChild()).getScope().isPresent(); } @@ -808,9 +754,11 @@ private boolean isTypeWithFullyQualifiedName(DifferenceElement element) { * Returns true if the DifferenceElement is a CsmChild with type arguments */ private boolean isNodeWithTypeArguments(DifferenceElement element) { - if (!element.isChild()) return false; + if (!element.isChild()) + return false; CsmChild child = (CsmChild) element.getElement(); - if (!NodeWithTypeArguments.class.isAssignableFrom(child.getChild().getClass())) return false; + if (!NodeWithTypeArguments.class.isAssignableFrom(child.getChild().getClass())) + return false; Optional> typeArgs = ((NodeWithTypeArguments) child.getChild()).getTypeArguments(); return typeArgs.isPresent() && typeArgs.get().size() > 0; } @@ -823,17 +771,18 @@ private int getIndexToNextTokenElement(TokenTextElement element, DifferenceEleme // number of token to skip int step = 0; // verify if the DifferenceElement is a ClassOrInterfaceType with a fully qualified name - if (!isTypeWithFullyQualifiedName(kept)) return 0; + if (!isTypeWithFullyQualifiedName(kept)) + return 0; CsmChild child = (CsmChild) kept.getElement(); // split the type fully qualified node name to an array of tokens - String[] parts = - ((ClassOrInterfaceType) child.getChild()).getNameWithScope().split("\\."); + String[] parts = ((ClassOrInterfaceType) child.getChild()).getNameWithScope().split("\\."); JavaToken token = element.getToken(); for (String part : parts) { if (part.equals(token.asString())) { // get 'dot' token token = token.getNextToken().get(); - if (!".".equals(token.asString())) break; + if (!".".equals(token.asString())) + break; // get the next part token = token.getNextToken().get(); step += 2; @@ -865,20 +814,24 @@ private int getIndexToNextTokenElement(TokenTextElement element, int nestedDiamo // number of token to skip int step = 0; Optional next = element.getToken().getNextToken(); - if (!next.isPresent()) return step; + if (!next.isPresent()) + return step; // because there is a token, first we need to increment the number of token to skip step++; // manage nested diamond operators by incrementing the level on LT token and decrementing on GT JavaToken nextToken = next.get(); Kind kind = Kind.valueOf(nextToken.getKind()); if (isDiamondOperator(kind)) { - if (Kind.GT.equals(kind)) nestedDiamondOperator--; - else nestedDiamondOperator++; + if (Kind.GT.equals(kind)) + nestedDiamondOperator--; + else + nestedDiamondOperator++; } // manage the fact where the first token is not a diamond operator but a whitespace // and the end of the token sequence to skip // for example in this declaration List a; - if (nestedDiamondOperator == 0 && !nextToken.getCategory().isWhitespace()) return step; + if (nestedDiamondOperator == 0 && !nextToken.getCategory().isWhitespace()) + return step; // recursively analyze token to skip return step += getIndexToNextTokenElement(new TokenTextElement(nextToken), nestedDiamondOperator); } @@ -890,19 +843,22 @@ private int getIndexToNextTokenElementInArrayType(TokenTextElement element, int // number of token to skip int step = 0; Optional next = element.getToken().getNextToken(); - if (!next.isPresent()) return step; + if (!next.isPresent()) + return step; // because there is a token, first we need to increment the number of token to skip step++; // manage array Level by decrementing the level on right bracket token JavaToken nextToken = next.get(); Kind kind = Kind.valueOf(nextToken.getKind()); if (isBracket(kind)) { - if (Kind.RBRACKET.equals(kind)) arrayLevel--; + if (Kind.RBRACKET.equals(kind)) + arrayLevel--; } // manage the fact where the first token is not a diamond operator but a whitespace // and the end of the token sequence to skip // for example in this declaration int [] a; - if (arrayLevel == 0 && !nextToken.getCategory().isWhitespace()) return step; + if (arrayLevel == 0 && !nextToken.getCategory().isWhitespace()) + return step; // recursively analyze token to skip return step += getIndexToNextTokenElementInArrayType(new TokenTextElement(nextToken), arrayLevel); } @@ -950,16 +906,12 @@ private void applyAddedDiffElement(Added added) { } TextElement addedTextElement = added.toTextElement(); boolean used = false; - boolean isPreviousElementNewline = - (originalIndex > 0) && originalElements.get(originalIndex - 1).isNewline(); + boolean isPreviousElementNewline = (originalIndex > 0) && originalElements.get(originalIndex - 1).isNewline(); if (isPreviousElementNewline) { - List elements = - processIndentation(indentation, originalElements.subList(0, originalIndex - 1)); + List elements = processIndentation(indentation, originalElements.subList(0, originalIndex - 1)); boolean nextIsRightBrace = nextIsRightBrace(originalIndex); for (TextElement e : elements) { - if (!nextIsRightBrace - && e instanceof TokenTextElement - && originalElements.get(originalIndex).isToken(((TokenTextElement) e).getTokenKind())) { + if (!nextIsRightBrace && e instanceof TokenTextElement && originalElements.get(originalIndex).isToken(((TokenTextElement) e).getTokenKind())) { originalIndex++; } else { nodeText.addElement(originalIndex++, e); @@ -993,19 +945,11 @@ private void applyAddedDiffElement(Added added) { // Handling trailing comments boolean sufficientTokensRemainToSkip = nodeText.numberOfElements() > originalIndex + 2; boolean currentIsAComment = nodeText.getTextElement(originalIndex).isComment(); - boolean previousIsAComment = originalIndex > 0 - && nodeText.getTextElement(originalIndex - 1).isComment(); + boolean previousIsAComment = originalIndex > 0 && nodeText.getTextElement(originalIndex - 1).isComment(); boolean currentIsNewline = nodeText.getTextElement(originalIndex).isNewline(); boolean isFirstElement = originalIndex == 0; - boolean previousIsWhiteSpace = originalIndex > 0 - && nodeText.getTextElement(originalIndex - 1).isWhiteSpace(); - boolean commentIsBeforeAddedElement = currentIsAComment - && addedTextElement.getRange().isPresent() - && nodeText.getTextElement(originalIndex) - .getRange() - .map(range -> - range.isBefore(addedTextElement.getRange().get())) - .orElse(false); + boolean previousIsWhiteSpace = originalIndex > 0 && nodeText.getTextElement(originalIndex - 1).isWhiteSpace(); + boolean commentIsBeforeAddedElement = currentIsAComment && addedTextElement.getRange().isPresent() && nodeText.getTextElement(originalIndex).getRange().map(range -> range.isBefore(addedTextElement.getRange().get())).orElse(false); if (sufficientTokensRemainToSkip && currentIsAComment && commentIsBeforeAddedElement) { // Need to get behind the comment: // FIXME: Why 2? This comment and the next newline? @@ -1074,64 +1018,64 @@ public static class ArrayIterator implements ListIterator { ListIterator iterator; - public ArrayIterator(List elements) { + public ArrayIterator(List elements) { this(elements, 0); } - public ArrayIterator(List elements, int index) { + public ArrayIterator(List elements, int index) { this.iterator = elements.listIterator(index); } @Override - public boolean hasNext() { + public boolean hasNext() { return iterator.hasNext(); } @Override - public T next() { + public T next() { return iterator.next(); } @Override - public boolean hasPrevious() { + public boolean hasPrevious() { return iterator.hasPrevious(); } @Override - public T previous() { + public T previous() { return iterator.previous(); } @Override - public int nextIndex() { + public int nextIndex() { return iterator.nextIndex(); } @Override - public int previousIndex() { + public int previousIndex() { return iterator.previousIndex(); } /* * Returns the current index in the underlying list */ - public int index() { + public int index() { return iterator.nextIndex() - 1; } @Override - public void remove() { + public void remove() { iterator.remove(); ; } @Override - public void set(T e) { + public void set(T e) { iterator.set(e); } @Override - public void add(T e) { + public void add(T e) { iterator.add(e); ; } @@ -1142,25 +1086,18 @@ public void add(T e) { */ private boolean isFollowedByUnindent(List diffElements, int diffIndex) { int nextIndexValue = diffIndex + 1; - return (nextIndexValue) < diffElements.size() - && diffElements.get(nextIndexValue).isAdded() - && diffElements.get(nextIndexValue).getElement() instanceof CsmUnindent; + return (nextIndexValue) < diffElements.size() && diffElements.get(nextIndexValue).isAdded() && diffElements.get(nextIndexValue).getElement() instanceof CsmUnindent; } - private int adjustIndentation( - List indentation, NodeText nodeText, int nodeTextIndex, boolean followedByUnindent) { - List indentationAdj = - processIndentation(indentation, nodeText.getElements().subList(0, nodeTextIndex - 1)); - if (nodeTextIndex < nodeText.numberOfElements() - && nodeText.getTextElement(nodeTextIndex).isToken(RBRACE)) { - indentationAdj = indentationAdj.subList( - 0, indentationAdj.size() - Math.min(STANDARD_INDENTATION_SIZE, indentationAdj.size())); + private int adjustIndentation(List indentation, NodeText nodeText, int nodeTextIndex, boolean followedByUnindent) { + List indentationAdj = processIndentation(indentation, nodeText.getElements().subList(0, nodeTextIndex - 1)); + if (nodeTextIndex < nodeText.numberOfElements() && nodeText.getTextElement(nodeTextIndex).isToken(RBRACE)) { + indentationAdj = indentationAdj.subList(0, indentationAdj.size() - Math.min(STANDARD_INDENTATION_SIZE, indentationAdj.size())); } else if (followedByUnindent) { indentationAdj = indentationAdj.subList(0, Math.max(0, indentationAdj.size() - STANDARD_INDENTATION_SIZE)); } for (TextElement e : indentationAdj) { - if ((nodeTextIndex < nodeText.numberOfElements()) - && nodeText.getTextElement(nodeTextIndex).isSpaceOrTab()) { + if ((nodeTextIndex < nodeText.numberOfElements()) && nodeText.getTextElement(nodeTextIndex).isSpaceOrTab()) { nodeTextIndex++; } else { nodeText.getElements().add(nodeTextIndex++, e); @@ -1176,22 +1113,18 @@ private int adjustIndentation( * Returns true if the current Added element is preceded by a Removed element. */ private boolean isAReplacement(int diffIndex) { - return (diffIndex > 0) - && diffElements.get(diffIndex).isAdded() - && diffElements.get(diffIndex - 1).isRemoved(); + return (diffIndex > 0) && diffElements.get(diffIndex).isAdded() && diffElements.get(diffIndex - 1).isRemoved(); } /* * Returns true if the current Removed element is followed by a Added element. */ private boolean isReplaced(int diffIndex) { - return (diffIndex < diffElements.size() - 1) - && diffElements.get(diffIndex + 1).isAdded() - && diffElements.get(diffIndex).isRemoved(); + return (diffIndex < diffElements.size() - 1) && diffElements.get(diffIndex + 1).isAdded() && diffElements.get(diffIndex).isRemoved(); } @Override - public String toString() { + public String toString() { return "Difference{" + diffElements + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java index 33f28eae34..dc990bf469 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java @@ -22,7 +22,7 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmElement; -public interface DifferenceElement { +public interface DifferenceElement { static DifferenceElement added(CsmElement element) { return new Added(element); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java index ed111d14a9..e9bb36fc1f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java @@ -46,25 +46,19 @@ public static class ChildPositionInfo { } @Override - public boolean equals(Object other) { - if (other == null || !(other instanceof ChildPositionInfo)) return false; + public boolean equals(Object other) { + if (other == null || !(other instanceof ChildPositionInfo)) + return false; ChildPositionInfo cpi = (ChildPositionInfo) other; // verify that the node content and the position are equal // because we can have nodes with the same content but in different lines // in this case we consider that nodes are not equals // If the nodes have no declared position they are considered equal. - return this.node.equals(cpi.node) - && (this.node.hasRange() == false && cpi.node.hasRange() == false - || (this.node.hasRange() - && cpi.node.hasRange() - && this.node - .getRange() - .get() - .contains(cpi.node.getRange().get()))); + return this.node.equals(cpi.node) && (this.node.hasRange() == false && cpi.node.hasRange() == false || (this.node.hasRange() && cpi.node.hasRange() && this.node.getRange().get().contains(cpi.node.getRange().get()))); } @Override - public int hashCode() { + public int hashCode() { return node.hashCode() + position.hashCode(); } } @@ -85,8 +79,7 @@ static boolean matching(CsmElement a, CsmElement b) { if (b instanceof CsmUnindent) { return false; } - throw new UnsupportedOperationException( - a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); + throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); } if (a instanceof CsmToken) { if (b instanceof CsmToken) { @@ -107,8 +100,7 @@ static boolean matching(CsmElement a, CsmElement b) { if (b instanceof CsmUnindent) { return false; } - throw new UnsupportedOperationException( - a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); + throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); } if (a instanceof CsmIndent) { return b instanceof CsmIndent; @@ -116,8 +108,7 @@ static boolean matching(CsmElement a, CsmElement b) { if (a instanceof CsmUnindent) { return b instanceof CsmUnindent; } - throw new UnsupportedOperationException( - a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); + throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); } private static boolean replacement(CsmElement a, CsmElement b) { @@ -133,8 +124,7 @@ private static boolean replacement(CsmElement a, CsmElement b) { if (b instanceof CsmToken) { return false; } - throw new UnsupportedOperationException( - a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); + throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); } if (a instanceof CsmToken) { if (b instanceof CsmToken) { @@ -146,15 +136,13 @@ private static boolean replacement(CsmElement a, CsmElement b) { return false; } } - throw new UnsupportedOperationException( - a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); + throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName()); } /** * Find the positions of all the given children. */ - private static List findChildrenPositions( - LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel) { + private static List findChildrenPositions(LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel) { List positions = new ArrayList<>(); for (int i = 0; i < calculatedSyntaxModel.elements.size(); i++) { CsmElement element = calculatedSyntaxModel.elements.get(i); @@ -169,9 +157,7 @@ private static List findChildrenPositions( * Calculate the Difference between two CalculatedSyntaxModel elements, determining which elements were kept, * which were added and which were removed. */ - static List calculate( - LexicalDifferenceCalculator.CalculatedSyntaxModel original, - LexicalDifferenceCalculator.CalculatedSyntaxModel after) { + static List calculate(LexicalDifferenceCalculator.CalculatedSyntaxModel original, LexicalDifferenceCalculator.CalculatedSyntaxModel after) { // For performance reasons we use the positions of matching children // to guide the calculation of the difference // @@ -204,19 +190,9 @@ static List calculate( // search the position of the node "child" in the original list of cms element final int currentPosOfNextChildInOriginal = posOfNextChildInOriginal; final int currentPosOfNextChildInAfter = posOfNextChildInAfter; - posOfNextChildInOriginal = childrenInOriginal.stream() - .filter(i -> i.equals(child)) - .map(i -> i.position) - .filter(position -> position > currentPosOfNextChildInOriginal) - .findFirst() - .orElse(posOfNextChildInOriginal); + posOfNextChildInOriginal = childrenInOriginal.stream().filter(i -> i.equals(child)).map(i -> i.position).filter(position -> position > currentPosOfNextChildInOriginal).findFirst().orElse(posOfNextChildInOriginal); // search the position of the node "child" in the modified list of cms element - posOfNextChildInAfter = childrenInAfter.stream() - .filter(i -> i.equals(child)) - .map(i -> i.position) - .filter(position -> position > currentPosOfNextChildInAfter) - .findFirst() - .orElse(posOfNextChildInAfter); + posOfNextChildInAfter = childrenInAfter.stream().filter(i -> i.equals(child)).map(i -> i.position).filter(position -> position > currentPosOfNextChildInAfter).findFirst().orElse(posOfNextChildInAfter); // Imagine that the common elements has been moved, for example in the case where the parameters of a method // are reversed // In this case the afterIndex will be greater than the position of the child in @@ -231,12 +207,8 @@ static List calculate( // modification but the previous position in the list was that of element 'a'. if (originalIndex < posOfNextChildInOriginal || afterIndex < posOfNextChildInAfter) { // defines the sublist of elements located before the common element - CalculatedSyntaxModel originalSub = originalIndex < posOfNextChildInOriginal - ? original.sub(originalIndex, posOfNextChildInOriginal) - : new CalculatedSyntaxModel(Collections.EMPTY_LIST); - CalculatedSyntaxModel afterSub = afterIndex < posOfNextChildInAfter - ? after.sub(afterIndex, posOfNextChildInAfter) - : new CalculatedSyntaxModel(Collections.EMPTY_LIST); + CalculatedSyntaxModel originalSub = originalIndex < posOfNextChildInOriginal ? original.sub(originalIndex, posOfNextChildInOriginal) : new CalculatedSyntaxModel(Collections.EMPTY_LIST); + CalculatedSyntaxModel afterSub = afterIndex < posOfNextChildInAfter ? after.sub(afterIndex, posOfNextChildInAfter) : new CalculatedSyntaxModel(Collections.EMPTY_LIST); elements.addAll(calculateImpl(originalSub, afterSub)); } if (afterIndex <= posOfNextChildInAfter) { @@ -251,12 +223,8 @@ static List calculate( afterIndex = afterIndex <= posOfNextChildInAfter ? posOfNextChildInAfter + 1 : afterIndex; } if (originalIndex < original.elements.size() || afterIndex < after.elements.size()) { - CalculatedSyntaxModel originalSub = originalIndex < original.elements.size() - ? original.sub(originalIndex, original.elements.size()) - : new CalculatedSyntaxModel(Collections.EMPTY_LIST); - CalculatedSyntaxModel afterSub = afterIndex < after.elements.size() - ? after.sub(afterIndex, after.elements.size()) - : new CalculatedSyntaxModel(Collections.EMPTY_LIST); + CalculatedSyntaxModel originalSub = originalIndex < original.elements.size() ? original.sub(originalIndex, original.elements.size()) : new CalculatedSyntaxModel(Collections.EMPTY_LIST); + CalculatedSyntaxModel afterSub = afterIndex < after.elements.size() ? after.sub(afterIndex, after.elements.size()) : new CalculatedSyntaxModel(Collections.EMPTY_LIST); elements.addAll(calculateImpl(originalSub, afterSub)); } return elements; @@ -280,9 +248,7 @@ private static int considerRemoval(CsmElement removedElement, int originalIndex, boolean dealtWith = false; if (removedElement instanceof CsmChild) { CsmChild removedChild = (CsmChild) removedElement; - if (removedChild.getChild() instanceof Type - && removedChild.getChild().getParentNode().isPresent() - && removedChild.getChild().getParentNode().get() instanceof VariableDeclarator) { + if (removedChild.getChild() instanceof Type && removedChild.getChild().getParentNode().isPresent() && removedChild.getChild().getParentNode().get() instanceof VariableDeclarator) { NodeText nodeTextForChild = LexicalPreservingPrinter.getOrCreateNodeText(removedChild.getChild()); considerRemoval(nodeTextForChild, elements); originalIndex++; @@ -296,9 +262,7 @@ private static int considerRemoval(CsmElement removedElement, int originalIndex, return originalIndex; } - private static List calculateImpl( - LexicalDifferenceCalculator.CalculatedSyntaxModel original, - LexicalDifferenceCalculator.CalculatedSyntaxModel after) { + private static List calculateImpl(LexicalDifferenceCalculator.CalculatedSyntaxModel original, LexicalDifferenceCalculator.CalculatedSyntaxModel after) { List elements = new LinkedList<>(); int originalIndex = 0; int afterIndex = 0; @@ -333,8 +297,7 @@ private static List calculateImpl( afterIndex++; } else { // We can try to remove the element or add it and look which one leads to the lower difference - List addingElements = - calculate(original.from(originalIndex), after.from(afterIndex + 1)); + List addingElements = calculate(original.from(originalIndex), after.from(afterIndex + 1)); List removingElements = null; if (cost(addingElements) > 0) { removingElements = calculate(original.from(originalIndex + 1), after.from(afterIndex)); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java index 47e80befe4..6c5694839b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java @@ -27,7 +27,7 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmToken; import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent; -public class Kept implements DifferenceElement { +public class Kept implements DifferenceElement { private final CsmElement element; @@ -36,29 +36,31 @@ public class Kept implements DifferenceElement { } @Override - public String toString() { + public String toString() { return "Kept{" + element + '}'; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Kept kept = (Kept) o; return element.equals(kept.element); } @Override - public int hashCode() { + public int hashCode() { return element.hashCode(); } @Override - public CsmElement getElement() { + public CsmElement getElement() { return element; } - public int getTokenType() { + public int getTokenType() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.getTokenType(); @@ -67,33 +69,33 @@ public int getTokenType() { } @Override - public boolean isAdded() { + public boolean isAdded() { return false; } @Override - public boolean isRemoved() { + public boolean isRemoved() { return false; } @Override - public boolean isKept() { + public boolean isKept() { return true; } - public boolean isIndent() { + public boolean isIndent() { return element instanceof CsmIndent; } - public boolean isUnindent() { + public boolean isUnindent() { return element instanceof CsmUnindent; } - public boolean isToken() { + public boolean isToken() { return element instanceof CsmToken; } - public boolean isPrimitiveType() { + public boolean isPrimitiveType() { if (isChild()) { LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) element; return csmChild.getChild() instanceof PrimitiveType; @@ -101,7 +103,7 @@ public boolean isPrimitiveType() { return false; } - public boolean isWhiteSpace() { + public boolean isWhiteSpace() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.isWhiteSpace(); @@ -109,7 +111,7 @@ public boolean isWhiteSpace() { return false; } - public boolean isWhiteSpaceOrComment() { + public boolean isWhiteSpaceOrComment() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return TokenTypes.isWhitespaceOrComment(csmToken.getTokenType()); @@ -117,7 +119,7 @@ public boolean isWhiteSpaceOrComment() { return false; } - public boolean isNewLine() { + public boolean isNewLine() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.isNewLine(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java index 06c860bb68..4a05d970ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java @@ -37,6 +37,7 @@ import com.github.javaparser.printer.lexicalpreservation.changes.*; import com.github.javaparser.utils.LineSeparator; import java.util.*; +import static com.github.javaparser.ast.Modifier.DefaultKeyword.*; class LexicalDifferenceCalculator { @@ -52,12 +53,12 @@ static class CalculatedSyntaxModel { this.elements = elements; } - public CalculatedSyntaxModel from(int index) { + public CalculatedSyntaxModel from(int index) { return new CalculatedSyntaxModel(new ArrayList<>(elements.subList(index, elements.size()))); } @Override - public String toString() { + public String toString() { return "CalculatedSyntaxModel{" + "elements=" + elements + '}'; } @@ -74,7 +75,7 @@ public static class CsmChild implements CsmElement { private final Node child; - public Node getChild() { + public Node getChild() { return child; } @@ -83,7 +84,7 @@ public Node getChild() { } @Override - public void prettyPrint(Node node, SourcePrinter printer) { + public void prettyPrint(Node node, SourcePrinter printer) { throw new UnsupportedOperationException("The prettyPrint method is not supported or implemented"); } @@ -91,47 +92,44 @@ public void prettyPrint(Node node, SourcePrinter printer) { * Verifies if the content of the {@code CsmElement} is the same as the provided {@code TextElement} */ @Override - public boolean isCorrespondingElement(TextElement textElement) { - return (textElement instanceof ChildTextElement) - && ((ChildTextElement) textElement).getChild() == getChild(); + public boolean isCorrespondingElement(TextElement textElement) { + return (textElement instanceof ChildTextElement) && ((ChildTextElement) textElement).getChild() == getChild(); } @Override - public String toString() { + public String toString() { return "child(" + child.getClass().getSimpleName() + ")"; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; CsmChild csmChild = (CsmChild) o; return child.equals(csmChild.child); } @Override - public int hashCode() { + public int hashCode() { return child.hashCode(); } } - List calculateListRemovalDifference( - ObservableProperty observableProperty, NodeList nodeList, int index) { + List calculateListRemovalDifference(ObservableProperty observableProperty, NodeList nodeList, int index) { Node container = nodeList.getParentNodeForChildren(); CsmElement element = ConcreteSyntaxModel.forClass(container.getClass()); CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container); - CalculatedSyntaxModel after = - calculatedSyntaxModelAfterListRemoval(element, observableProperty, nodeList, index); + CalculatedSyntaxModel after = calculatedSyntaxModelAfterListRemoval(element, observableProperty, nodeList, index); return DifferenceElementCalculator.calculate(original, after); } - List calculateListAdditionDifference( - ObservableProperty observableProperty, NodeList nodeList, int index, Node nodeAdded) { + List calculateListAdditionDifference(ObservableProperty observableProperty, NodeList nodeList, int index, Node nodeAdded) { Node container = nodeList.getParentNodeForChildren(); CsmElement element = ConcreteSyntaxModel.forClass(container.getClass()); CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container); - CalculatedSyntaxModel after = - calculatedSyntaxModelAfterListAddition(element, observableProperty, nodeList, index, nodeAdded); + CalculatedSyntaxModel after = calculatedSyntaxModelAfterListAddition(element, observableProperty, nodeList, index, nodeAdded); List differenceElements = DifferenceElementCalculator.calculate(original, after); // Set the line separator character tokens LineSeparator lineSeparator = container.getLineEndingStyleOrDefault(LineSeparator.SYSTEM); @@ -157,25 +155,21 @@ private CsmElement getNewLineToken(LineSeparator lineSeparator) { return CsmElement.newline(lineSeparator); } - List calculateListReplacementDifference( - ObservableProperty observableProperty, NodeList nodeList, int index, Node newValue) { + List calculateListReplacementDifference(ObservableProperty observableProperty, NodeList nodeList, int index, Node newValue) { Node container = nodeList.getParentNodeForChildren(); CsmElement element = ConcreteSyntaxModel.forClass(container.getClass()); CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container); - CalculatedSyntaxModel after = - calculatedSyntaxModelAfterListReplacement(element, observableProperty, nodeList, index, newValue); + CalculatedSyntaxModel after = calculatedSyntaxModelAfterListReplacement(element, observableProperty, nodeList, index, newValue); return DifferenceElementCalculator.calculate(original, after); } - void calculatePropertyChange( - NodeText nodeText, Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + void calculatePropertyChange(NodeText nodeText, Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { if (nodeText == null) { throw new NullPointerException(); } CsmElement element = ConcreteSyntaxModel.forClass(observedNode.getClass()); CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, observedNode); - CalculatedSyntaxModel after = - calculatedSyntaxModelAfterPropertyChange(element, observedNode, property, oldValue, newValue); + CalculatedSyntaxModel after = calculatedSyntaxModelAfterPropertyChange(element, observedNode, property, oldValue, newValue); List differenceElements = DifferenceElementCalculator.calculate(original, after); Difference difference = new Difference(differenceElements, nodeText, observedNode); difference.apply(); @@ -201,8 +195,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List optional = (Optional) rawValue; if (optional.isPresent()) { if (!(optional.get() instanceof NodeList)) { - throw new IllegalStateException("Expected NodeList, found " - + optional.get().getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + optional.get().getClass().getCanonicalName()); } nodeList = (NodeList) optional.get(); } else { @@ -238,8 +230,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List) rawValue; } @@ -270,8 +261,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List elements = new LinkedList<>(); calculatedSyntaxModelForNode(csm, node, elements, new PropertyChange(property, oldValue, newValue)); return new CalculatedSyntaxModel(elements); } // Visible for testing - CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval( - CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index) { + CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index) { List elements = new LinkedList<>(); Node container = nodeList.getParentNodeForChildren(); calculatedSyntaxModelForNode(csm, container, elements, new ListRemovalChange(observableProperty, index)); @@ -410,48 +443,40 @@ CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval( } // Visible for testing - CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition( - CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index, Node nodeAdded) { + CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index, Node nodeAdded) { List elements = new LinkedList<>(); Node container = nodeList.getParentNodeForChildren(); - calculatedSyntaxModelForNode( - csm, container, elements, new ListAdditionChange(observableProperty, index, nodeAdded)); + calculatedSyntaxModelForNode(csm, container, elements, new ListAdditionChange(observableProperty, index, nodeAdded)); return new CalculatedSyntaxModel(elements); } // Visible for testing - CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition( - Node container, ObservableProperty observableProperty, int index, Node nodeAdded) { + CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(Node container, ObservableProperty observableProperty, int index, Node nodeAdded) { CsmElement csm = ConcreteSyntaxModel.forClass(container.getClass()); Object rawValue = observableProperty.getRawValue(container); if (!(rawValue instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + rawValue.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + rawValue.getClass().getCanonicalName()); } NodeList nodeList = (NodeList) rawValue; return calculatedSyntaxModelAfterListAddition(csm, observableProperty, nodeList, index, nodeAdded); } // Visible for testing - CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval( - Node container, ObservableProperty observableProperty, int index) { + CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(Node container, ObservableProperty observableProperty, int index) { CsmElement csm = ConcreteSyntaxModel.forClass(container.getClass()); Object rawValue = observableProperty.getRawValue(container); if (!(rawValue instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + rawValue.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + rawValue.getClass().getCanonicalName()); } NodeList nodeList = (NodeList) rawValue; return calculatedSyntaxModelAfterListRemoval(csm, observableProperty, nodeList, index); } // Visible for testing - private CalculatedSyntaxModel calculatedSyntaxModelAfterListReplacement( - CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index, Node newValue) { + private CalculatedSyntaxModel calculatedSyntaxModelAfterListReplacement(CsmElement csm, ObservableProperty observableProperty, NodeList nodeList, int index, Node newValue) { List elements = new LinkedList<>(); Node container = nodeList.getParentNodeForChildren(); - calculatedSyntaxModelForNode( - csm, container, elements, new ListReplacementChange(observableProperty, index, newValue)); + calculatedSyntaxModelForNode(csm, container, elements, new ListReplacementChange(observableProperty, index, newValue)); return new CalculatedSyntaxModel(elements); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java index 0474bce8a6..657f9c7b4f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java @@ -26,7 +26,6 @@ import static com.github.javaparser.utils.Utils.decapitalize; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.toList; - import com.github.javaparser.JavaToken; import com.github.javaparser.Range; import com.github.javaparser.ast.DataKey; @@ -59,7 +58,7 @@ * operating on the AST and then used them to reproduce the source code * in its original formatting including the AST changes. */ -public class LexicalPreservingPrinter { +public class LexicalPreservingPrinter { private static String JAVA_UTIL_OPTIONAL = Optional.class.getCanonicalName(); @@ -70,7 +69,8 @@ public class LexicalPreservingPrinter { /** * The nodetext for a node is stored in the node's data field. This is the key to set and retrieve it. */ - public static final DataKey NODE_TEXT_DATA = new DataKey() {}; + public static final DataKey NODE_TEXT_DATA = new DataKey() { + }; private static final LexicalDifferenceCalculator LEXICAL_DIFFERENCE_CALCULATOR = new LexicalDifferenceCalculator(); @@ -121,8 +121,7 @@ private static AstObserver createObserver() { private static class Observer extends PropagatingAstObserver { @Override - public void concretePropertyChange( - Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { + public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) { if (oldValue == newValue) { // Not really a change, ignore return; @@ -132,16 +131,12 @@ public void concretePropertyChange( } if (property == ObservableProperty.COMMENT) { Optional parentNode = observedNode.getParentNode(); - NodeText nodeText = parentNode - .map(parent -> getOrCreateNodeText(parentNode.get())) - .orElseGet(() -> getOrCreateNodeText(observedNode)); + NodeText nodeText = parentNode.map(parent -> getOrCreateNodeText(parentNode.get())).orElseGet(() -> getOrCreateNodeText(observedNode)); if (oldValue == null) { // this case corresponds to the addition of a comment - int index = parentNode.isPresent() - ? // Find the position of the comment node and put in front of it the [...] - nodeText.findChild(observedNode) - : // - 0; + int index = parentNode.isPresent() ? // Find the position of the comment node and put in front of it the [...] + nodeText.findChild(observedNode) : // + 0; /* Add the same indentation to the comment as the previous node * for example if we want to add a comment on the body of the method declaration : * Actual code @@ -178,16 +173,14 @@ public void concretePropertyChange( if (isCompleteLine(nodeText.getElements(), index)) { removeAllExtraCharacters(nodeText.getElements(), index); } else { - removeAllExtraCharactersStartingFrom( - nodeText.getElements().listIterator(index)); + removeAllExtraCharactersStartingFrom(nodeText.getElements().listIterator(index)); } } else { throw new UnsupportedOperationException("Trying to remove something that is not a comment!"); } } else { // this is a replacement of a comment - List matchingTokens = - findTokenTextElementForComment((Comment) oldValue, nodeText); + List matchingTokens = findTokenTextElementForComment((Comment) oldValue, nodeText); if (matchingTokens.size() != 1) { throw new IllegalStateException("The matching comment to be replaced could not be found"); } @@ -204,14 +197,17 @@ public void concretePropertyChange( } private boolean isCompleteLine(List elements, int index) { - if (index <= 0 || index >= elements.size()) return false; + if (index <= 0 || index >= elements.size()) + return false; boolean isCompleteLine = true; ListIterator iterator = elements.listIterator(index); // verify if elements after the index are only spaces or tabs while (iterator.hasNext()) { TextElement textElement = iterator.next(); - if (textElement.isNewline()) break; - if (textElement.isSpaceOrTab()) continue; + if (textElement.isNewline()) + break; + if (textElement.isSpaceOrTab()) + continue; isCompleteLine = false; break; } @@ -219,15 +215,18 @@ private boolean isCompleteLine(List elements, int index) { iterator = elements.listIterator(index); while (iterator.hasPrevious() && isCompleteLine) { TextElement textElement = iterator.previous(); - if (textElement.isNewline()) break; - if (textElement.isSpaceOrTab()) continue; + if (textElement.isNewline()) + break; + if (textElement.isSpaceOrTab()) + continue; isCompleteLine = false; } return isCompleteLine; } private void removeAllExtraCharacters(List elements, int index) { - if (index < 0 || index >= elements.size()) return; + if (index < 0 || index >= elements.size()) + return; removeAllExtraCharactersStartingFrom(elements.listIterator(index)); removeAllExtraCharactersBeforePosition(elements.listIterator(index)); } @@ -265,18 +264,15 @@ private void removeAllExtraCharactersStartingFrom(ListIterator iter private TokenTextElement makeCommentToken(Comment newComment) { if (newComment.isJavadocComment()) { - return new TokenTextElement( - JAVADOC_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter()); + return new TokenTextElement(JAVADOC_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter()); } if (newComment.isLineComment()) { return new TokenTextElement(SINGLE_LINE_COMMENT, newComment.getHeader() + newComment.getContent()); } if (newComment.isBlockComment()) { - return new TokenTextElement( - MULTI_LINE_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter()); + return new TokenTextElement(MULTI_LINE_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter()); } - throw new UnsupportedOperationException( - "Unknown type of comment: " + newComment.getClass().getSimpleName()); + throw new UnsupportedOperationException("Unknown type of comment: " + newComment.getClass().getSimpleName()); } private int getIndexOfComment(Comment oldValue, NodeText nodeText) { @@ -299,35 +295,17 @@ private List findChildTextElementForComment(Comment oldValue, matchingChildElements = selectMatchingChildElements(oldValue, nodeText); if (matchingChildElements.size() > 1) { // Duplicate child nodes found, refine the result - matchingChildElements = matchingChildElements.stream() - .filter(t -> t.getChild().hasRange() && oldValue.hasRange()) - .filter(t -> t.getChild() - .getRange() - .get() - .equals(oldValue.getRange().get()) - || (t.getChild().getComment().isPresent() - && t.getChild().getComment().get().hasRange() - && t.getChild() - .getComment() - .get() - .getRange() - .get() - .equals(oldValue.getRange().get()))) - .collect(toList()); + matchingChildElements = matchingChildElements.stream().filter(t -> t.getChild().hasRange() && oldValue.hasRange()).filter(t -> t.getChild().getRange().get().equals(oldValue.getRange().get()) || (t.getChild().getComment().isPresent() && t.getChild().getComment().get().hasRange() && t.getChild().getComment().get().getRange().get().equals(oldValue.getRange().get()))).collect(toList()); } if (matchingChildElements.size() != 1) { - throw new IllegalStateException( - "The matching child text element for the comment to be removed could not be found."); + throw new IllegalStateException("The matching child text element for the comment to be removed could not be found."); } return matchingChildElements; } private List selectMatchingChildElements(Comment oldValue, NodeText nodeText) { List result = new ArrayList<>(); - List childTextElements = nodeText.getElements().stream() - .filter(e -> e.isChild()) - .map(c -> (ChildTextElement) c) - .collect(toList()); + List childTextElements = nodeText.getElements().stream().filter(e -> e.isChild()).map(c -> (ChildTextElement) c).collect(toList()); ListIterator iterator = childTextElements.listIterator(); while (iterator.hasNext()) { ChildTextElement textElement = iterator.next(); @@ -336,8 +314,7 @@ private List selectMatchingChildElements(Comment oldValue, Nod continue; } Node node = textElement.getChild(); - if (node.getComment().isPresent() - && isSameComment(node.getComment().get(), oldValue)) { + if (node.getComment().isPresent() && isSameComment(node.getComment().get(), oldValue)) { result.add(textElement); continue; } @@ -352,35 +329,15 @@ private boolean isSameComment(Comment childValue, Comment oldValue) { private List findTokenTextElementForComment(Comment oldValue, NodeText nodeText) { List matchingTokens; if (oldValue instanceof JavadocComment) { - matchingTokens = nodeText.getElements().stream() - .filter(e -> e.isToken(JAVADOC_COMMENT)) - .map(e -> (TokenTextElement) e) - .filter(t -> t.getText().equals(oldValue.asString())) - .collect(toList()); + matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(JAVADOC_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().equals(oldValue.asString())).collect(toList()); } else if (oldValue instanceof BlockComment) { - matchingTokens = nodeText.getElements().stream() - .filter(e -> e.isToken(MULTI_LINE_COMMENT)) - .map(e -> (TokenTextElement) e) - .filter(t -> t.getText().equals(oldValue.asString())) - .collect(toList()); + matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(MULTI_LINE_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().equals(oldValue.asString())).collect(toList()); } else { - matchingTokens = nodeText.getElements().stream() - .filter(e -> e.isToken(SINGLE_LINE_COMMENT)) - .map(e -> (TokenTextElement) e) - .filter(t -> t.getText().trim().equals((oldValue.asString()).trim())) - .collect(toList()); + matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(SINGLE_LINE_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().trim().equals((oldValue.asString()).trim())).collect(toList()); } // To check that a comment matches in the list of tokens, if exists the range must be always checked, // as comments with the same content may exist on different lines. - return matchingTokens.stream() - .filter(t -> (!t.getToken().hasRange() && !oldValue.hasRange()) - || (t.getToken().hasRange() - && oldValue.hasRange() - && t.getToken() - .getRange() - .get() - .equals(oldValue.getRange().get()))) - .collect(toList()); + return matchingTokens.stream().filter(t -> (!t.getToken().hasRange() && !oldValue.hasRange()) || (t.getToken().hasRange() && oldValue.hasRange() && t.getToken().getRange().get().equals(oldValue.getRange().get()))).collect(toList()); } /** @@ -408,10 +365,7 @@ private void fixIndentOfAddedNode(NodeText nodeText, int index) { for (int j = 0; j < numberOfIndentationCharacters; j++) { if (currentSpaceCandidate != null) { // use the current (or last) indentation character - nodeText.addElement( - index, - new TokenTextElement( - JavaToken.Kind.SPACE.getKind(), currentSpaceCandidate.expand())); + nodeText.addElement(index, new TokenTextElement(JavaToken.Kind.SPACE.getKind(), currentSpaceCandidate.expand())); } else { // use the default indentation character nodeText.addElement(index, new TokenTextElement(JavaToken.Kind.SPACE.getKind())); @@ -424,32 +378,25 @@ private void fixIndentOfAddedNode(NodeText nodeText, int index) { } @Override - public void concreteListChange( - NodeList changedList, ListChangeType type, int index, Node nodeAddedOrRemoved) { + public void concreteListChange(NodeList changedList, ListChangeType type, int index, Node nodeAddedOrRemoved) { NodeText nodeText = getOrCreateNodeText(changedList.getParentNodeForChildren()); final List differenceElements; if (type == AstObserver.ListChangeType.REMOVAL) { - differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListRemovalDifference( - findNodeListName(changedList), changedList, index); + differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListRemovalDifference(findNodeListName(changedList), changedList, index); } else if (type == AstObserver.ListChangeType.ADDITION) { - differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListAdditionDifference( - findNodeListName(changedList), changedList, index, nodeAddedOrRemoved); + differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListAdditionDifference(findNodeListName(changedList), changedList, index, nodeAddedOrRemoved); } else { throw new UnsupportedOperationException("Unknown change type: " + type); } - Difference difference = - new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren()); + Difference difference = new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren()); difference.apply(); } @Override - public void concreteListReplacement(NodeList changedList, int index, Node oldValue, Node newValue) { + public void concreteListReplacement(NodeList changedList, int index, Node oldValue, Node newValue) { NodeText nodeText = getOrCreateNodeText(changedList.getParentNodeForChildren()); - List differenceElements = - LEXICAL_DIFFERENCE_CALCULATOR.calculateListReplacementDifference( - findNodeListName(changedList), changedList, index, newValue); - Difference difference = - new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren()); + List differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListReplacementDifference(findNodeListName(changedList), changedList, index, newValue); + Difference difference = new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren()); difference.apply(); } } @@ -461,10 +408,8 @@ private static void storeInitialText(Node root) { // range of interest and ignore all other branches root.getTokenRange().ifPresent(rootTokenRange -> { for (JavaToken token : rootTokenRange) { - Range tokenRange = - token.getRange().orElseThrow(() -> new RuntimeException("Token without range: " + token)); - Node owner = root.findByRange(tokenRange) - .orElseThrow(() -> new RuntimeException("Token without node owning it: " + token)); + Range tokenRange = token.getRange().orElseThrow(() -> new RuntimeException("Token without range: " + token)); + Node owner = root.findByRange(tokenRange).orElseThrow(() -> new RuntimeException("Token without node owning it: " + token)); if (!tokensByNode.containsKey(owner)) { tokensByNode.put(owner, new LinkedList<>()); } @@ -474,7 +419,7 @@ private static void storeInitialText(Node root) { new TreeVisitor() { @Override - public void process(Node node) { + public void process(Node node) { if (!node.isPhantom()) { storeInitialTextForOneNode(node, tokensByNode.get(node)); } @@ -500,8 +445,7 @@ private static void storeInitialTextForOneNode(Node node, List nodeTo elements.add(new Pair<>(token.getRange().get(), new TokenTextElement(token))); } elements.sort(comparing(e -> e.a.begin)); - node.setData( - NODE_TEXT_DATA, new NodeText(elements.stream().map(p -> p.b).collect(toList()))); + node.setData(NODE_TEXT_DATA, new NodeText(elements.stream().map(p -> p.b).collect(toList()))); } // @@ -521,9 +465,7 @@ private static Iterator tokensPreceeding(final Node node) { } return new TextElementIteratorsFactory.EmptyIterator(); } - return new TextElementIteratorsFactory.CascadingIterator<>( - TextElementIteratorsFactory.partialReverseIterator(parentNodeText, index - 1), - () -> tokensPreceeding(node.getParentNode().get())); + return new TextElementIteratorsFactory.CascadingIterator<>(TextElementIteratorsFactory.partialReverseIterator(parentNodeText, index - 1), () -> tokensPreceeding(node.getParentNode().get())); } // @@ -545,7 +487,7 @@ public static String print(Node node) { private static void prettyPrintingTextNode(Node node, NodeText nodeText) { if (node instanceof PrimitiveType) { PrimitiveType primitiveType = (PrimitiveType) node; - switch (primitiveType.getType()) { + switch(primitiveType.getType()) { case BOOLEAN: nodeText.addToken(BOOLEAN, node.toString()); break; @@ -577,14 +519,12 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) { } if (node instanceof JavadocComment) { Comment comment = (JavadocComment) node; - nodeText.addToken( - JAVADOC_COMMENT, comment.getHeader() + ((JavadocComment) node).getContent() + comment.getFooter()); + nodeText.addToken(JAVADOC_COMMENT, comment.getHeader() + ((JavadocComment) node).getContent() + comment.getFooter()); return; } if (node instanceof BlockComment) { Comment comment = (BlockComment) node; - nodeText.addToken( - MULTI_LINE_COMMENT, comment.getHeader() + ((BlockComment) node).getContent() + comment.getFooter()); + nodeText.addToken(MULTI_LINE_COMMENT, comment.getHeader() + ((BlockComment) node).getContent() + comment.getFooter()); return; } if (node instanceof LineComment) { @@ -594,9 +534,7 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) { } if (node instanceof Modifier) { Modifier modifier = (Modifier) node; - nodeText.addToken( - LexicalDifferenceCalculator.toToken(modifier), - modifier.getKeyword().asString()); + nodeText.addToken(LexicalDifferenceCalculator.toToken(modifier), modifier.getKeyword().asString()); return; } interpret(node, ConcreteSyntaxModel.forClass(node.getClass()), nodeText); @@ -606,8 +544,7 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) { * TODO: Process CsmIndent and CsmUnindent before reaching this point */ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText) { - LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel = - new LexicalDifferenceCalculator().calculatedSyntaxModelForNode(csm, node); + LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel = new LexicalDifferenceCalculator().calculatedSyntaxModelForNode(csm, node); List indentation = findIndentation(node); boolean pendingIndentation = false; // Add a comment and line separator if necessary @@ -615,16 +552,14 @@ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText) // new comment has no range so in this case we want to force the comment before the node if (!comment.hasRange()) { LineSeparator lineSeparator = node.getLineEndingStyleOrDefault(LineSeparator.SYSTEM); - calculatedSyntaxModel.elements.add( - 0, new CsmToken(eolTokenKind(lineSeparator), lineSeparator.asRawString())); + calculatedSyntaxModel.elements.add(0, new CsmToken(eolTokenKind(lineSeparator), lineSeparator.asRawString())); calculatedSyntaxModel.elements.add(0, new CsmChild(comment)); } }); for (CsmElement element : calculatedSyntaxModel.elements) { if (element instanceof CsmIndent) { int indexCurrentElement = calculatedSyntaxModel.elements.indexOf(element); - if (calculatedSyntaxModel.elements.size() > indexCurrentElement - && !(calculatedSyntaxModel.elements.get(indexCurrentElement + 1) instanceof CsmUnindent)) { + if (calculatedSyntaxModel.elements.size() > indexCurrentElement && !(calculatedSyntaxModel.elements.get(indexCurrentElement + 1) instanceof CsmUnindent)) { for (int i = 0; i < Difference.STANDARD_INDENTATION_SIZE; i++) { indentation.add(new TokenTextElement(SPACE, " ")); } @@ -653,8 +588,7 @@ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText) // Indentation should probably be dealt with before because an indentation has effects also on the // following lines if (!(element instanceof CsmIndent) && !(element instanceof CsmUnindent)) { - throw new UnsupportedOperationException( - "Unknown element type: " + element.getClass().getSimpleName()); + throw new UnsupportedOperationException("Unknown element type: " + element.getClass().getSimpleName()); } } } @@ -662,15 +596,13 @@ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText) // so they have to be handled in a special way if (node instanceof VariableDeclarator) { VariableDeclarator variableDeclarator = (VariableDeclarator) node; - variableDeclarator.getParentNode().ifPresent(parent -> ((NodeWithVariables) parent) - .getMaximumCommonType() - .ifPresent(mct -> { - int extraArrayLevels = variableDeclarator.getType().getArrayLevel() - mct.getArrayLevel(); - for (int i = 0; i < extraArrayLevels; i++) { - nodeText.addElement(new TokenTextElement(LBRACKET)); - nodeText.addElement(new TokenTextElement(RBRACKET)); - } - })); + variableDeclarator.getParentNode().ifPresent(parent -> ((NodeWithVariables) parent).getMaximumCommonType().ifPresent(mct -> { + int extraArrayLevels = variableDeclarator.getType().getArrayLevel() - mct.getArrayLevel(); + for (int i = 0; i < extraArrayLevels; i++) { + nodeText.addElement(new TokenTextElement(LBRACKET)); + nodeText.addElement(new TokenTextElement(RBRACKET)); + } + })); } return nodeText; } @@ -723,13 +655,11 @@ private static boolean isReturningOptionalNodeList(Method m) { private static ObservableProperty findNodeListName(NodeList nodeList) { Node parent = nodeList.getParentNodeForChildren(); for (Method m : parent.getClass().getMethods()) { - if (m.getParameterCount() == 0 - && m.getReturnType().getCanonicalName().equals(JAVAPARSER_AST_NODELIST)) { + if (m.getParameterCount() == 0 && m.getReturnType().getCanonicalName().equals(JAVAPARSER_AST_NODELIST)) { try { Object raw = m.invoke(parent); if (!(raw instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + raw.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + raw.getClass().getCanonicalName()); } NodeList result = (NodeList) raw; if (result == nodeList) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java index 46eeb36fe9..b984e217b3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java @@ -21,28 +21,28 @@ import java.io.StringWriter; -public class LexicalPreservingVisitor { +public class LexicalPreservingVisitor { private StringWriter writer; - public LexicalPreservingVisitor() { + public LexicalPreservingVisitor() { this(new StringWriter()); } - public LexicalPreservingVisitor(StringWriter writer) { + public LexicalPreservingVisitor(StringWriter writer) { this.writer = writer; } - public void visit(ChildTextElement child) { + public void visit(ChildTextElement child) { child.accept(this); } - public void visit(TokenTextElement token) { + public void visit(TokenTextElement token) { writer.append(token.getText()); } @Override - public String toString() { + public String toString() { return writer.toString(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java index 0cece8c009..3c095026cc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java @@ -21,7 +21,7 @@ import java.util.NoSuchElementException; -public interface LookaheadIterator { +public interface LookaheadIterator { /** * Returns the next element in iteration without advancing the underlying iterator. @@ -35,7 +35,7 @@ public interface LookaheadIterator { * * @return the next element from the iterator */ - public E peek(); + public E peek(); /** * Returns the next element in iteration without advancing the underlying iterator. @@ -44,5 +44,5 @@ public interface LookaheadIterator { * @return the next element from the iterator * @throws NoSuchElementException if the iterator is already exhausted according to {@link #hasNext()} */ - public E element(); + public E element(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java index e659300517..cffdb20171 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java @@ -91,8 +91,7 @@ int findElement(TextElementMatcher matcher) { int findElement(TextElementMatcher matcher, int from) { int res = tryToFindElement(matcher, from); if (res == NOT_FOUND) { - throw new IllegalArgumentException(String.format( - "I could not find child '%s' from position %d. Elements: %s", matcher, from, elements)); + throw new IllegalArgumentException(String.format("I could not find child '%s' from position %d. Elements: %s", matcher, from, elements)); } return res; } @@ -126,7 +125,7 @@ int tryToFindChild(Node child, int from) { // // Removing single elements // - public void remove(TextElementMatcher matcher, boolean potentiallyFollowingWhitespace) { + public void remove(TextElementMatcher matcher, boolean potentiallyFollowingWhitespace) { int i = 0; for (TextElement e : elements) { if (matcher.match(e)) { @@ -190,7 +189,7 @@ List getElements() { } @Override - public String toString() { + public String toString() { return "NodeText{" + elements + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java index 42c0a1e2ce..bff2d59cd4 100755 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java @@ -34,7 +34,7 @@ * @param the type of elements returned by this iterator. * @since 4.0 */ -public class PeekingIterator implements ListIterator, LookaheadIterator { +public class PeekingIterator implements ListIterator, LookaheadIterator { /** * The iterator being decorated. @@ -66,7 +66,7 @@ public class PeekingIterator implements ListIterator, LookaheadIterator * @return a new peeking iterator * @throws NullPointerException if the iterator is null */ - public PeekingIterator peekingIterator(final ListIterator iterator) { + public PeekingIterator peekingIterator(final ListIterator iterator) { Objects.requireNonNull(iterator, "iterator"); if (iterator instanceof PeekingIterator) { final PeekingIterator it = (PeekingIterator) iterator; @@ -80,7 +80,7 @@ public PeekingIterator peekingIterator(final ListIterator iterator) { * * @param iterator the iterator to decorate */ - public PeekingIterator(final ListIterator iterator) { + public PeekingIterator(final ListIterator iterator) { this.iterator = iterator; } @@ -89,7 +89,7 @@ public PeekingIterator(final ListIterator iterator) { * * @param list the provider of the iterator to decorate */ - public PeekingIterator(final List list) { + public PeekingIterator(final List list) { this.iterator = list.listIterator(); } @@ -108,7 +108,7 @@ private void fill() { } @Override - public boolean hasNext() { + public boolean hasNext() { if (exhausted) { return false; } @@ -128,7 +128,7 @@ public boolean hasNext() { * @return the next element from the iterator */ @Override - public E peek() { + public E peek() { fill(); return exhausted ? null : slot; } @@ -141,7 +141,7 @@ public E peek() { * @throws NoSuchElementException if the iterator is already exhausted according to {@link #hasNext()} */ @Override - public E element() { + public E element() { fill(); if (exhausted) { throw new NoSuchElementException(); @@ -150,7 +150,7 @@ public E element() { } @Override - public E next() { + public E next() { if (!hasNext()) { throw new NoSuchElementException(); } @@ -168,7 +168,7 @@ public E next() { * prior to the call to {@link #remove()} */ @Override - public void remove() { + public void remove() { if (slotFilled) { throw new IllegalStateException("peek() or element() called before remove()"); } @@ -176,17 +176,17 @@ public void remove() { } @Override - public boolean hasPrevious() { + public boolean hasPrevious() { return iterator.hasPrevious(); } @Override - public E previous() { + public E previous() { return iterator.previous(); } @Override - public int nextIndex() { + public int nextIndex() { return iterator.nextIndex(); } @@ -195,18 +195,19 @@ public int nextIndex() { * Returns list size - 1 if the listiterator is at the end of the list. * Returns -1 if the listiterator is at the beginning of the list. */ - public int currentIndex() { - if (!hasPrevious()) return previousIndex(); + public int currentIndex() { + if (!hasPrevious()) + return previousIndex(); return nextIndex() - 1; } @Override - public int previousIndex() { + public int previousIndex() { return iterator.previousIndex(); } @Override - public void set(E e) { + public void set(E e) { if (slotFilled) { throw new IllegalStateException("peek() or element() called before set()"); } @@ -214,7 +215,7 @@ public void set(E e) { } @Override - public void add(E e) { + public void add(E e) { if (slotFilled) { throw new IllegalStateException("peek() or element() called before add()"); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java index 6e8a2605a0..f8e7f45f24 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java @@ -21,7 +21,6 @@ package com.github.javaparser.printer.lexicalpreservation; import static java.util.Collections.synchronizedMap; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.observer.AstObserver; import com.github.javaparser.ast.observer.AstObserverAdapter; @@ -34,7 +33,7 @@ * @deprecated This class is no longer used phantom node are now an attribute of each node */ @Deprecated -public class PhantomNodeLogic { +public class PhantomNodeLogic { private static final int LEVELS_TO_EXPLORE = 3; @@ -43,7 +42,7 @@ public class PhantomNodeLogic { private static final AstObserver cacheCleaner = new AstObserverAdapter() { @Override - public void parentChange(Node observedNode, Node previousParent, Node newParent) { + public void parentChange(Node observedNode, Node previousParent, Node newParent) { isPhantomNodeCache.remove(observedNode); } }; @@ -55,15 +54,7 @@ static boolean isPhantomNode(Node node) { if (node instanceof UnknownType) { return true; } - boolean res = (node.getParentNode().isPresent() - && node.getParentNode().get().hasRange() - && node.hasRange() - && !node.getParentNode() - .get() - .getRange() - .get() - .contains(node.getRange().get()) - || inPhantomNode(node, LEVELS_TO_EXPLORE)); + boolean res = (node.getParentNode().isPresent() && node.getParentNode().get().hasRange() && node.hasRange() && !node.getParentNode().get().getRange().get().contains(node.getRange().get()) || inPhantomNode(node, LEVELS_TO_EXPLORE)); isPhantomNodeCache.put(node, res); node.register(cacheCleaner); return res; @@ -73,9 +64,7 @@ static boolean isPhantomNode(Node node) { * A node contained in a phantom node is also a phantom node. We limit how many levels up we check just for performance reasons. */ private static boolean inPhantomNode(Node node, int levels) { - return node.getParentNode().isPresent() - && (isPhantomNode(node.getParentNode().get()) - || inPhantomNode(node.getParentNode().get(), levels - 1)); + return node.getParentNode().isPresent() && (isPhantomNode(node.getParentNode().get()) || inPhantomNode(node.getParentNode().get(), levels - 1)); } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java index 944438d5af..8129f45d22 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java @@ -19,7 +19,7 @@ */ package com.github.javaparser.printer.lexicalpreservation; -public interface PrintableTextElement { +public interface PrintableTextElement { void accept(LexicalPreservingVisitor visitor); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java index 6b40c43fe0..b0c882186b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java @@ -25,7 +25,7 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmElement; import com.github.javaparser.printer.concretesyntaxmodel.CsmToken; -public class Removed implements DifferenceElement { +public class Removed implements DifferenceElement { private final CsmElement element; @@ -34,38 +34,39 @@ public class Removed implements DifferenceElement { } @Override - public String toString() { + public String toString() { return "Removed{" + element + '}'; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Removed removed = (Removed) o; return element.equals(removed.element); } @Override - public int hashCode() { + public int hashCode() { return element.hashCode(); } @Override - public CsmElement getElement() { + public CsmElement getElement() { return element; } - public Node getChild() { + public Node getChild() { if (isChild()) { LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) element; return csmChild.getChild(); } - throw new IllegalStateException( - "Removed is not a " + LexicalDifferenceCalculator.CsmChild.class.getSimpleName()); + throw new IllegalStateException("Removed is not a " + LexicalDifferenceCalculator.CsmChild.class.getSimpleName()); } - public int getTokenType() { + public int getTokenType() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.getTokenType(); @@ -74,25 +75,25 @@ public int getTokenType() { } @Override - public boolean isAdded() { + public boolean isAdded() { return false; } @Override - public boolean isRemoved() { + public boolean isRemoved() { return true; } @Override - public boolean isKept() { + public boolean isKept() { return false; } - public boolean isToken() { + public boolean isToken() { return element instanceof CsmToken; } - public boolean isPrimitiveType() { + public boolean isPrimitiveType() { if (isChild()) { LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) element; return csmChild.getChild() instanceof PrimitiveType; @@ -100,7 +101,7 @@ public boolean isPrimitiveType() { return false; } - public boolean isWhiteSpace() { + public boolean isWhiteSpace() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.isWhiteSpace(); @@ -108,7 +109,7 @@ public boolean isWhiteSpace() { return false; } - public boolean isWhiteSpaceNotEol() { + public boolean isWhiteSpaceNotEol() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.isWhiteSpaceNotEol(); @@ -116,7 +117,7 @@ public boolean isWhiteSpaceNotEol() { return false; } - public boolean isNewLine() { + public boolean isNewLine() { if (isToken()) { CsmToken csmToken = (CsmToken) element; return csmToken.isNewLine(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java index 4e9afb0bde..d9161e4d03 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java @@ -90,9 +90,7 @@ final boolean isProcessed() { } private List getIndicesBeingRemoved() { - return IntStream.range(firstElementIndex, firstElementIndex + removedList.size()) - .boxed() - .collect(Collectors.toList()); + return IntStream.range(firstElementIndex, firstElementIndex + removedList.size()).boxed().collect(Collectors.toList()); } /** @@ -144,27 +142,21 @@ final boolean isLastElement(Removed element) { * @return true if the RemovedGroup equates to a complete line */ final boolean isACompleteLine() { - return hasOnlyWhitespace(getFirstElement(), hasOnlyWhitespaceInFrontFunction) - && hasOnlyWhitespace(getLastElement(), hasOnlyWhitespaceBehindFunction); + return hasOnlyWhitespace(getFirstElement(), hasOnlyWhitespaceInFrontFunction) && hasOnlyWhitespace(getLastElement(), hasOnlyWhitespaceBehindFunction); } - private final Function hasOnlyWhitespaceJavaTokenInFrontFunction = - begin -> hasOnlyWhiteSpaceForTokenFunction(begin, token -> token.getPreviousToken()); + private final Function hasOnlyWhitespaceJavaTokenInFrontFunction = begin -> hasOnlyWhiteSpaceForTokenFunction(begin, token -> token.getPreviousToken()); - private final Function hasOnlyWhitespaceJavaTokenBehindFunction = - end -> hasOnlyWhiteSpaceForTokenFunction(end, token -> token.getNextToken()); + private final Function hasOnlyWhitespaceJavaTokenBehindFunction = end -> hasOnlyWhiteSpaceForTokenFunction(end, token -> token.getNextToken()); - private final Function hasOnlyWhitespaceInFrontFunction = - tokenRange -> hasOnlyWhitespaceJavaTokenInFrontFunction.apply(tokenRange.getBegin()); + private final Function hasOnlyWhitespaceInFrontFunction = tokenRange -> hasOnlyWhitespaceJavaTokenInFrontFunction.apply(tokenRange.getBegin()); - private final Function hasOnlyWhitespaceBehindFunction = - tokenRange -> hasOnlyWhitespaceJavaTokenBehindFunction.apply(tokenRange.getEnd()); + private final Function hasOnlyWhitespaceBehindFunction = tokenRange -> hasOnlyWhitespaceJavaTokenBehindFunction.apply(tokenRange.getEnd()); private boolean hasOnlyWhitespace(Removed startElement, Function hasOnlyWhitespaceFunction) { boolean hasOnlyWhitespace = false; if (startElement.isChild()) { - LexicalDifferenceCalculator.CsmChild csmChild = - (LexicalDifferenceCalculator.CsmChild) startElement.getElement(); + LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) startElement.getElement(); Node child = csmChild.getChild(); Optional tokenRange = child.getTokenRange(); if (tokenRange.isPresent()) { @@ -179,8 +171,7 @@ private boolean hasOnlyWhitespace(Removed startElement, Function> tokenFunction) { + private boolean hasOnlyWhiteSpaceForTokenFunction(JavaToken token, Function> tokenFunction) { Optional tokenResult = tokenFunction.apply(token); if (tokenResult.isPresent()) { if (TokenTypes.isWhitespaceButNotEndOfLine(tokenResult.get().getKind())) { @@ -214,21 +205,19 @@ final Optional getIndentation() { Iterator it = iterator(); while (it.hasNext()) { firstElement = (Removed) it.next(); - if (firstElement.isNewLine()) continue; + if (firstElement.isNewLine()) + continue; break; } if (firstElement.isChild()) { - LexicalDifferenceCalculator.CsmChild csmChild = - (LexicalDifferenceCalculator.CsmChild) firstElement.getElement(); + LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) firstElement.getElement(); Node child = csmChild.getChild(); Optional tokenRange = child.getTokenRange(); if (tokenRange.isPresent()) { JavaToken begin = tokenRange.get().getBegin(); if (hasOnlyWhitespaceJavaTokenInFrontFunction.apply(begin)) { Optional previousToken = begin.getPreviousToken(); - while (previousToken.isPresent() - && (TokenTypes.isWhitespaceButNotEndOfLine( - previousToken.get().getKind()))) { + while (previousToken.isPresent() && (TokenTypes.isWhitespaceButNotEndOfLine(previousToken.get().getKind()))) { indentation++; previousToken = previousToken.get().getPreviousToken(); } @@ -252,12 +241,12 @@ public final Iterator iterator() { private int currentIndex = 0; @Override - public boolean hasNext() { + public boolean hasNext() { return currentIndex < removedList.size() && removedList.get(currentIndex) != null; } @Override - public Removed next() { + public Removed next() { return removedList.get(currentIndex++); } }; diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java index 4d8669fe55..7c9790545e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java @@ -30,7 +30,7 @@ * Elements in a CsmMix have been reshuffled. It could also mean that * some new elements have been added or removed to the mix. */ -public class Reshuffled implements DifferenceElement { +public class Reshuffled implements DifferenceElement { private final CsmMix previousOrder; @@ -42,51 +42,54 @@ public class Reshuffled implements DifferenceElement { } @Override - public String toString() { + public String toString() { return "Reshuffled{" + nextOrder + ", previous=" + previousOrder + '}'; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Reshuffled that = (Reshuffled) o; - if (!previousOrder.equals(that.previousOrder)) return false; + if (!previousOrder.equals(that.previousOrder)) + return false; return nextOrder.equals(that.nextOrder); } @Override - public int hashCode() { + public int hashCode() { int result = previousOrder.hashCode(); result = 31 * result + nextOrder.hashCode(); return result; } @Override - public CsmMix getElement() { + public CsmMix getElement() { return nextOrder; } - public CsmMix getPreviousOrder() { + public CsmMix getPreviousOrder() { return previousOrder; } - public CsmMix getNextOrder() { + public CsmMix getNextOrder() { return nextOrder; } @Override - public boolean isAdded() { + public boolean isAdded() { return false; } @Override - public boolean isRemoved() { + public boolean isRemoved() { return false; } @Override - public boolean isKept() { + public boolean isKept() { return false; } @@ -95,7 +98,7 @@ public boolean isKept() { * with all eof token replaced by the specified line separator. The line separator parameter must be a CsmToken with a valid line separator. */ @Override - public DifferenceElement replaceEolTokens(CsmElement lineSeparator) { + public DifferenceElement replaceEolTokens(CsmElement lineSeparator) { CsmMix modifiedNextOrder = new CsmMix(replaceTokens(nextOrder.getElements(), lineSeparator)); CsmMix modifiedPreviousOrder = new CsmMix(replaceTokens(previousOrder.getElements(), lineSeparator)); return new Reshuffled(modifiedPreviousOrder, modifiedNextOrder); @@ -105,9 +108,7 @@ public DifferenceElement replaceEolTokens(CsmElement lineSeparator) { * Replaces all eol tokens in the list by the specified line separator token */ private List replaceTokens(List elements, CsmElement lineSeparator) { - return elements.stream() - .map(element -> isNewLineToken(element) ? lineSeparator : element) - .collect(Collectors.toList()); + return elements.stream().map(element -> isNewLineToken(element) ? lineSeparator : element).collect(Collectors.toList()); } /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java index dc0bc1e275..05f8444ab2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java @@ -25,16 +25,13 @@ import com.github.javaparser.printer.lexicalpreservation.Difference.ArrayIterator; import java.util.*; -public class ReshuffledDiffElementExtractor { +public class ReshuffledDiffElementExtractor { private final NodeText nodeText; private enum MatchClassification { - ALL(1), - PREVIOUS_AND_SAME(2), - NEXT_AND_SAME(3), - SAME_ONLY(4), - ALMOST(5); + + ALL(1), PREVIOUS_AND_SAME(2), NEXT_AND_SAME(3), SAME_ONLY(4), ALMOST(5); private final int priority; @@ -55,7 +52,7 @@ private ReshuffledDiffElementExtractor(NodeText nodeText) { this.nodeText = nodeText; } - public void extract(List diffElements) { + public void extract(List diffElements) { ArrayIterator iterator = new ArrayIterator<>(diffElements); while (iterator.hasNext()) { DifferenceElement diffElement = iterator.next(); @@ -65,25 +62,18 @@ public void extract(List diffElements) { CsmMix elementsFromPreviousOrder = reshuffled.getPreviousOrder(); CsmMix elementsFromNextOrder = reshuffled.getNextOrder(); // This contains indexes from elementsFromNextOrder to indexes from elementsFromPreviousOrder - Map correspondanceBetweenNextOrderAndPreviousOrder = - getCorrespondanceBetweenNextOrderAndPreviousOrder( - elementsFromPreviousOrder, elementsFromNextOrder); + Map correspondanceBetweenNextOrderAndPreviousOrder = getCorrespondanceBetweenNextOrderAndPreviousOrder(elementsFromPreviousOrder, elementsFromNextOrder); // We now find out which Node Text elements corresponds to the elements in the original CSM - List nodeTextIndexOfPreviousElements = - findIndexOfCorrespondingNodeTextElement(elementsFromPreviousOrder.getElements(), nodeText); - PeekingIterator nodeTextIndexOfPreviousElementsIterator = - new PeekingIterator<>(nodeTextIndexOfPreviousElements); + List nodeTextIndexOfPreviousElements = findIndexOfCorrespondingNodeTextElement(elementsFromPreviousOrder.getElements(), nodeText); + PeekingIterator nodeTextIndexOfPreviousElementsIterator = new PeekingIterator<>(nodeTextIndexOfPreviousElements); Map nodeTextIndexToPreviousCSMIndex = new HashMap<>(); while (nodeTextIndexOfPreviousElementsIterator.hasNext()) { int value = nodeTextIndexOfPreviousElementsIterator.next(); if (value != -1) { - nodeTextIndexToPreviousCSMIndex.put( - value, nodeTextIndexOfPreviousElementsIterator.currentIndex()); + nodeTextIndexToPreviousCSMIndex.put(value, nodeTextIndexOfPreviousElementsIterator.currentIndex()); } } - int lastNodeTextIndex = nodeTextIndexOfPreviousElements.stream() - .max(Integer::compareTo) - .orElse(-1); + int lastNodeTextIndex = nodeTextIndexOfPreviousElements.stream().max(Integer::compareTo).orElse(-1); // Elements to be added at the end List elementsToBeAddedAtTheEnd = new LinkedList<>(); List nextOrderElements = elementsFromNextOrder.getElements(); @@ -98,12 +88,9 @@ public void extract(List diffElements) { if (correspondanceBetweenNextOrderAndPreviousOrder.containsKey(nj)) { originalCsmIndex = correspondanceBetweenNextOrderAndPreviousOrder.get(nj); if (!elementsToAddBeforeGivenOriginalCSMElement.containsKey(originalCsmIndex)) { - elementsToAddBeforeGivenOriginalCSMElement.put( - originalCsmIndex, new LinkedList<>()); + elementsToAddBeforeGivenOriginalCSMElement.put(originalCsmIndex, new LinkedList<>()); } - elementsToAddBeforeGivenOriginalCSMElement - .get(originalCsmIndex) - .add(nextOrderElements.get(ni)); + elementsToAddBeforeGivenOriginalCSMElement.get(originalCsmIndex).add(nextOrderElements.get(ni)); } } // it does not preceed anything, so it goes at the end @@ -126,15 +113,12 @@ public void extract(List diffElements) { if (nodeTextIndexToPreviousCSMIndex.containsKey(ntIndex)) { int indexOfOriginalCSMElement = nodeTextIndexToPreviousCSMIndex.get(ntIndex); if (elementsToAddBeforeGivenOriginalCSMElement.containsKey(indexOfOriginalCSMElement)) { - for (CsmElement elementToAdd : - elementsToAddBeforeGivenOriginalCSMElement.get(indexOfOriginalCSMElement)) { + for (CsmElement elementToAdd : elementsToAddBeforeGivenOriginalCSMElement.get(indexOfOriginalCSMElement)) { iterator.add(new Added(elementToAdd)); } } - CsmElement originalCSMElement = - elementsFromPreviousOrder.getElements().get(indexOfOriginalCSMElement); - boolean toBeKept = correspondanceBetweenNextOrderAndPreviousOrder.containsValue( - indexOfOriginalCSMElement); + CsmElement originalCSMElement = elementsFromPreviousOrder.getElements().get(indexOfOriginalCSMElement); + boolean toBeKept = correspondanceBetweenNextOrderAndPreviousOrder.containsValue(indexOfOriginalCSMElement); if (toBeKept) { iterator.add(new Kept(originalCSMElement)); } else { @@ -167,24 +151,17 @@ public void extract(List diffElements) { * case the search for the next element of the list L1 must start from the * position of the last element kept {@code syncNextIndex}. */ - private Map getCorrespondanceBetweenNextOrderAndPreviousOrder( - CsmMix elementsFromPreviousOrder, CsmMix elementsFromNextOrder) { + private Map getCorrespondanceBetweenNextOrderAndPreviousOrder(CsmMix elementsFromPreviousOrder, CsmMix elementsFromNextOrder) { Map correspondanceBetweenNextOrderAndPreviousOrder = new HashMap<>(); - ArrayIterator previousOrderElementsIterator = - new ArrayIterator<>(elementsFromPreviousOrder.getElements()); + ArrayIterator previousOrderElementsIterator = new ArrayIterator<>(elementsFromPreviousOrder.getElements()); int syncNextIndex = 0; while (previousOrderElementsIterator.hasNext()) { CsmElement pe = previousOrderElementsIterator.next(); - ArrayIterator nextOrderElementsIterator = - new ArrayIterator<>(elementsFromNextOrder.getElements(), syncNextIndex); + ArrayIterator nextOrderElementsIterator = new ArrayIterator<>(elementsFromNextOrder.getElements(), syncNextIndex); while (nextOrderElementsIterator.hasNext()) { CsmElement ne = nextOrderElementsIterator.next(); - if (!correspondanceBetweenNextOrderAndPreviousOrder - .values() - .contains(previousOrderElementsIterator.index()) - && DifferenceElementCalculator.matching(ne, pe)) { - correspondanceBetweenNextOrderAndPreviousOrder.put( - nextOrderElementsIterator.index(), previousOrderElementsIterator.index()); + if (!correspondanceBetweenNextOrderAndPreviousOrder.values().contains(previousOrderElementsIterator.index()) && DifferenceElementCalculator.matching(ne, pe)) { + correspondanceBetweenNextOrderAndPreviousOrder.put(nextOrderElementsIterator.index(), previousOrderElementsIterator.index()); // set the position to start on the next {@code nextOrderElementsIterator} iteration syncNextIndex = nextOrderElementsIterator.index(); break; @@ -213,20 +190,17 @@ private List findIndexOfCorrespondingNodeTextElement(List e boolean hasSamePreviousElement = false; if (!isFirstIterationOnNodeTextElements && !isFirstIterationOnCsmElements) { TextElement previousTextElement = nodeText.getTextElement(currentTextElementIndex - 1); - hasSamePreviousElement = - elements.get(previousCsmElementIndex).isCorrespondingElement(previousTextElement); + hasSamePreviousElement = elements.get(previousCsmElementIndex).isCorrespondingElement(previousTextElement); } boolean hasSameNextElement = false; if (csmElementListIterator.hasNext()) { TextElement nextTextElement = nodeTextListIterator.peek(); - hasSameNextElement = elements.get(csmElementListIterator.nextIndex()) - .isCorrespondingElement(nextTextElement); + hasSameNextElement = elements.get(csmElementListIterator.nextIndex()).isCorrespondingElement(nextTextElement); } if (hasSamePreviousElement && hasSameNextElement) { potentialMatches.putIfAbsent(MatchClassification.ALL, currentTextElementIndex); } else if (hasSamePreviousElement) { - potentialMatches.putIfAbsent( - MatchClassification.PREVIOUS_AND_SAME, currentTextElementIndex); + potentialMatches.putIfAbsent(MatchClassification.PREVIOUS_AND_SAME, currentTextElementIndex); } else if (hasSameNextElement) { potentialMatches.putIfAbsent(MatchClassification.NEXT_AND_SAME, currentTextElementIndex); } else { @@ -238,8 +212,7 @@ private List findIndexOfCorrespondingNodeTextElement(List e } } // Prioritize the matches from best to worst - Optional bestMatchKey = - potentialMatches.keySet().stream().min(Comparator.comparing(MatchClassification::getPriority)); + Optional bestMatchKey = potentialMatches.keySet().stream().min(Comparator.comparing(MatchClassification::getPriority)); if (bestMatchKey.isPresent()) { correspondingIndices.add(potentialMatches.get(bestMatchKey.get())); } else { diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java index e4200a375a..409f3b4a5c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java @@ -32,13 +32,11 @@ public abstract class TextElement implements TextElementMatcher, PrintableTextEl abstract boolean isToken(int tokenKind); final boolean isCommentToken() { - return isToken(GeneratedJavaParserConstants.JAVADOC_COMMENT) - || isToken(GeneratedJavaParserConstants.SINGLE_LINE_COMMENT) - || isToken(GeneratedJavaParserConstants.MULTI_LINE_COMMENT); + return isToken(GeneratedJavaParserConstants.JAVADOC_COMMENT) || isToken(GeneratedJavaParserConstants.SINGLE_LINE_COMMENT) || isToken(GeneratedJavaParserConstants.MULTI_LINE_COMMENT); } @Override - public boolean match(TextElement textElement) { + public boolean match(TextElement textElement) { return this.equals(textElement); } @@ -71,7 +69,7 @@ public final boolean isWhiteSpaceOrComment() { */ public abstract boolean isChildOfClass(Class nodeClass); - public boolean isChild() { + public boolean isChild() { return isChildOfClass(Node.class); } @@ -85,10 +83,8 @@ public boolean isChild() { * @return TextElementMatcher that matches any TextElement with the same Range */ TextElementMatcher matchByRange() { - return (TextElement textElement) -> getRange() - .flatMap(r1 -> textElement.getRange().map(r1::equals)) - . // We're missing range information. This may happen when a node is manually instantiated. Don't be too - // harsh on that: - orElse(true); + return (TextElement textElement) -> getRange().flatMap(r1 -> textElement.getRange().map(r1::equals)).// We're missing range information. This may happen when a node is manually instantiated. Don't be too + // harsh on that: + orElse(true); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java index 1d4b8abedc..5dfd7e3733 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java @@ -43,13 +43,13 @@ interface Provider { private boolean lastReturnedFromNext = false; - public CascadingIterator(Iterator current, Provider nextProvider) { + public CascadingIterator(Iterator current, Provider nextProvider) { this.nextProvider = nextProvider; this.current = current; } @Override - public boolean hasNext() { + public boolean hasNext() { if (current.hasNext()) { return true; } @@ -60,7 +60,7 @@ public boolean hasNext() { } @Override - public E next() { + public E next() { if (current.hasNext()) { lastReturnedFromCurrent = true; lastReturnedFromNext = false; @@ -75,7 +75,7 @@ public E next() { } @Override - public void remove() { + public void remove() { if (lastReturnedFromCurrent) { current.remove(); return; @@ -91,12 +91,12 @@ public void remove() { static class EmptyIterator implements Iterator { @Override - public boolean hasNext() { + public boolean hasNext() { return false; } @Override - public E next() { + public E next() { throw new IllegalArgumentException(); } } @@ -112,18 +112,19 @@ private static class SingleElementIterator implements Iterator { } @Override - public boolean hasNext() { + public boolean hasNext() { return !returned; } @Override - public E next() { + public E next() { returned = true; return element; } @Override - public void remove() {} + public void remove() { + } } static class ComposedIterator implements Iterator { @@ -138,7 +139,7 @@ static class ComposedIterator implements Iterator { } @Override - public boolean hasNext() { + public boolean hasNext() { if (currIndex >= elements.size()) { return false; } @@ -150,7 +151,7 @@ public boolean hasNext() { } @Override - public E next() { + public E next() { if (!hasNext()) { throw new IllegalArgumentException(); } @@ -158,7 +159,7 @@ public E next() { } @Override - public void remove() { + public void remove() { elements.get(currIndex).remove(); } } @@ -169,7 +170,7 @@ private static Iterator reverseIterator(NodeText nodeText, int return new SingleElementIterator((TokenTextElement) textElement) { @Override - public void remove() { + public void remove() { nodeText.removeElement(index); } }; diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java index 696d998e70..cabd5bb61b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java @@ -20,7 +20,7 @@ */ package com.github.javaparser.printer.lexicalpreservation; -public interface TextElementMatcher { +public interface TextElementMatcher { boolean match(TextElement textElement); diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java index 3a21ddac4c..2f2704ea73 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java @@ -32,12 +32,12 @@ static TextElementMatcher byNode(final Node node) { return new TextElementMatcher() { @Override - public boolean match(TextElement textElement) { + public boolean match(TextElement textElement) { return textElement.isNode(node); } @Override - public String toString() { + public String toString() { return "match node " + node; } }; diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java index d488b53392..bed759f7bf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java @@ -26,7 +26,7 @@ import com.github.javaparser.ast.Node; import java.util.Optional; -public class TokenTextElement extends TextElement { +public class TokenTextElement extends TextElement { private final JavaToken token; @@ -43,38 +43,40 @@ public class TokenTextElement extends TextElement { } @Override - public String expand() { + public String expand() { return token.getText(); } // Visible for testing - public String getText() { + public String getText() { return token.getText(); } - public int getTokenKind() { + public int getTokenKind() { return token.getKind(); } - public JavaToken getToken() { + public JavaToken getToken() { return token; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; TokenTextElement that = (TokenTextElement) o; return token.equals(that.token); } @Override - public int hashCode() { + public int hashCode() { return token.hashCode(); } @Override - public String toString() { + public String toString() { return token.toString(); } @@ -89,52 +91,52 @@ boolean isNode(Node node) { } @Override - public boolean isWhiteSpace() { + public boolean isWhiteSpace() { return token.getCategory().isWhitespace(); } @Override - public boolean isSpaceOrTab() { + public boolean isSpaceOrTab() { return token.getCategory().isWhitespaceButNotEndOfLine(); } @Override - public boolean isComment() { + public boolean isComment() { return token.getCategory().isComment(); } @Override - public boolean isSeparator() { + public boolean isSeparator() { return token.getCategory().isSeparator(); } @Override - public boolean isNewline() { + public boolean isNewline() { return token.getCategory().isEndOfLine(); } @Override - public boolean isChildOfClass(Class nodeClass) { + public boolean isChildOfClass(Class nodeClass) { return false; } @Override - public boolean isIdentifier() { + public boolean isIdentifier() { return getToken().getCategory().isIdentifier(); } @Override - public boolean isKeyword() { + public boolean isKeyword() { return getToken().getCategory().isKeyword(); } @Override - public boolean isLiteral() { + public boolean isLiteral() { return getToken().getCategory().isLiteral(); } @Override - public boolean isPrimitive() { + public boolean isPrimitive() { return Kind.valueOf(getTokenKind()).isPrimitive(); } @@ -144,7 +146,7 @@ Optional getRange() { } @Override - public void accept(LexicalPreservingVisitor visitor) { + public void accept(LexicalPreservingVisitor visitor) { visitor.visit(this); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java index 79e6e98259..d4e0d158d2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java @@ -28,10 +28,10 @@ /** * This represents a change that has happened to a specific Node. */ -public interface Change { +public interface Change { default boolean evaluate(CsmConditional csmConditional, Node node) { - switch (csmConditional.getCondition()) { + switch(csmConditional.getCondition()) { case FLAG: return csmConditional.getProperties().stream().anyMatch(p -> (Boolean) getValue(p, node)); case IS_NOT_EMPTY: @@ -39,11 +39,9 @@ default boolean evaluate(CsmConditional csmConditional, Node node) { case IS_EMPTY: return Utils.valueIsNullOrEmpty(getValue(csmConditional.getProperty(), node)); case IS_PRESENT: - return !Utils.valueIsNullOrEmptyStringOrOptional(getValue(csmConditional.getProperty(), node)) - && !isEvaluatedOnDerivedProperty(csmConditional.getProperty()); + return !Utils.valueIsNullOrEmptyStringOrOptional(getValue(csmConditional.getProperty(), node)) && !isEvaluatedOnDerivedProperty(csmConditional.getProperty()); default: - throw new UnsupportedOperationException( - "" + csmConditional.getProperty() + " " + csmConditional.getCondition()); + throw new UnsupportedOperationException("" + csmConditional.getProperty() + " " + csmConditional.getCondition()); } } @@ -98,8 +96,7 @@ default boolean isEvaluatedOnDerivedProperty(ObservableProperty property) { * field but the validation condition must not be checked. * Be careful because NoChange property must not affect this evaluation. */ - return currentProperty != null - && (property.isDerived() && property.name().endsWith(currentProperty.name())); + return currentProperty != null && (property.isDerived() && property.name().endsWith(currentProperty.name())); } /* diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java index c9d5f59fe7..acae568092 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java @@ -28,7 +28,7 @@ /** * The Addition of an element to a list. */ -public class ListAdditionChange implements Change { +public class ListAdditionChange implements Change { private final ObservableProperty observableProperty; @@ -36,14 +36,14 @@ public class ListAdditionChange implements Change { private final Node nodeAdded; - public ListAdditionChange(ObservableProperty observableProperty, int index, Node nodeAdded) { + public ListAdditionChange(ObservableProperty observableProperty, int index, Node nodeAdded) { this.observableProperty = observableProperty; this.index = index; this.nodeAdded = nodeAdded; } @Override - public Object getValue(ObservableProperty property, Node node) { + public Object getValue(ObservableProperty property, Node node) { if (property == observableProperty) { Object currentRawValue = new NoChange().getValue(property, node); if (currentRawValue instanceof Optional) { @@ -51,8 +51,7 @@ public Object getValue(ObservableProperty property, Node node) { currentRawValue = optional.orElse(null); } if (!(currentRawValue instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); } NodeList currentNodeList = (NodeList) currentRawValue; // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's @@ -68,7 +67,7 @@ public Object getValue(ObservableProperty property, Node node) { } @Override - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return observableProperty; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java index 4562806b88..a5e0ac2639 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java @@ -29,19 +29,19 @@ /** * The removal of an element from a list. */ -public class ListRemovalChange implements Change { +public class ListRemovalChange implements Change { private final ObservableProperty observableProperty; private final int index; - public ListRemovalChange(ObservableProperty observableProperty, int index) { + public ListRemovalChange(ObservableProperty observableProperty, int index) { this.observableProperty = observableProperty; this.index = index; } @Override - public Object getValue(ObservableProperty property, Node node) { + public Object getValue(ObservableProperty property, Node node) { if (property == observableProperty) { Object currentRawValue = new NoChange().getValue(property, node); if (currentRawValue instanceof Optional) { @@ -49,8 +49,7 @@ public Object getValue(ObservableProperty property, Node node) { currentRawValue = optional.orElse(null); } if (!(currentRawValue instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); } NodeList currentNodeList = (NodeList) currentRawValue; // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's @@ -65,9 +64,7 @@ public Object getValue(ObservableProperty property, Node node) { // which deletes the relationship between a node and its parent node. // This relationship is necessary to reinforce indentation, for example when // deleting a node, as indentation can be carried by the parent node. - currentNodeList.stream() - .filter(n -> !isSameNode(currentNodeList.get(index), n)) - .forEach(selectedNode -> newNodeList.add(selectedNode)); + currentNodeList.stream().filter(n -> !isSameNode(currentNodeList.get(index), n)).forEach(selectedNode -> newNodeList.add(selectedNode)); return newNodeList; } return new NoChange().getValue(property, node); @@ -78,10 +75,7 @@ private boolean isSameNode(Node n1, Node n2) { } private boolean isSameRange(Node n1, Node n2) { - return (!n1.hasRange() && !n2.hasRange()) - || (n1.hasRange() - && n2.hasRange() - && isSameRange(n1.getRange().get(), n2.getRange().get())); + return (!n1.hasRange() && !n2.hasRange()) || (n1.hasRange() && n2.hasRange() && isSameRange(n1.getRange().get(), n2.getRange().get())); } private boolean isSameRange(Range r1, Range r2) { @@ -89,7 +83,7 @@ private boolean isSameRange(Range r1, Range r2) { } @Override - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return observableProperty; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java index afbf5a35d9..01047cd634 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java @@ -28,7 +28,7 @@ /** * The replacement of an element in a list. */ -public class ListReplacementChange implements Change { +public class ListReplacementChange implements Change { private final ObservableProperty observableProperty; @@ -36,14 +36,14 @@ public class ListReplacementChange implements Change { private final Node newValue; - public ListReplacementChange(ObservableProperty observableProperty, int index, Node newValue) { + public ListReplacementChange(ObservableProperty observableProperty, int index, Node newValue) { this.observableProperty = observableProperty; this.index = index; this.newValue = newValue; } @Override - public Object getValue(ObservableProperty property, Node node) { + public Object getValue(ObservableProperty property, Node node) { if (property == observableProperty) { Object currentRawValue = new NoChange().getValue(property, node); if (currentRawValue instanceof Optional) { @@ -51,8 +51,7 @@ public Object getValue(ObservableProperty property, Node node) { currentRawValue = optional.orElse(null); } if (!(currentRawValue instanceof NodeList)) { - throw new IllegalStateException( - "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); + throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName()); } NodeList currentNodeList = (NodeList) currentRawValue; // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's @@ -68,7 +67,7 @@ public Object getValue(ObservableProperty property, Node node) { } @Override - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return observableProperty; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java index a60c7eb4ee..332be3fd9d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java @@ -26,15 +26,15 @@ /** * No change. The Node is not mutated. */ -public class NoChange implements Change { +public class NoChange implements Change { @Override - public Object getValue(ObservableProperty property, Node node) { + public Object getValue(ObservableProperty property, Node node) { return property.getRawValue(node); } @Override - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return null; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java index 3fa75ed307..bcc25908e3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java +++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java @@ -26,7 +26,7 @@ /** * The change in value of a property. */ -public class PropertyChange implements Change { +public class PropertyChange implements Change { private final ObservableProperty property; @@ -34,27 +34,27 @@ public class PropertyChange implements Change { private final Object newValue; - public PropertyChange(ObservableProperty property, Object oldValue, Object newValue) { + public PropertyChange(ObservableProperty property, Object oldValue, Object newValue) { this.property = property; this.oldValue = oldValue; this.newValue = newValue; } @Override - public ObservableProperty getProperty() { + public ObservableProperty getProperty() { return property; } - public Object getOldValue() { + public Object getOldValue() { return oldValue; } - public Object getNewValue() { + public Object getNewValue() { return newValue; } @Override - public Object getValue(ObservableProperty property, Node node) { + public Object getValue(ObservableProperty property, Node node) { if (property == this.property) { return newValue; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java b/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java index 9723ec726b..af45b3ddd7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java +++ b/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java @@ -26,4 +26,5 @@ @Documented @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.SOURCE) -public @interface NotNull {} +public @interface NotNull { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java b/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java index 7fcf1968a7..7997401e8e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java @@ -26,4 +26,5 @@ @Documented @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.SOURCE) -public @interface Nullable {} +public @interface Nullable { +} diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java index 2aafae0b7b..cd87c21c1a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java @@ -39,7 +39,7 @@ * * @author Federico Tomassetti */ -public interface Context { +public interface Context { /** * Returns the node wrapped in the context @@ -109,8 +109,7 @@ default SymbolReference solveType(String name) { * * @return The declaration associated with the given type name. */ - default SymbolReference solveType( - String name, @Nullable List typeArguments) { + default SymbolReference solveType(String name, @Nullable List typeArguments) { // Default to solving within the parent context. return solveTypeInParentContext(name, typeArguments); } @@ -139,8 +138,7 @@ default SymbolReference solveTypeInParentContext(String * * @return The declaration associated with the given type name. */ - default SymbolReference solveTypeInParentContext( - String name, @Nullable List typeArguments) { + default SymbolReference solveTypeInParentContext(String name, @Nullable List typeArguments) { Optional optionalParentContext = getParent(); if (!optionalParentContext.isPresent()) { return SymbolReference.unsolved(); @@ -268,10 +266,7 @@ default Optional localVariableDeclarationInScope(String name // First check if the variable is directly declared within this context. Node wrappedNode = getWrappedNode(); Context parentContext = getParent().get(); - Optional localResolutionResults = - parentContext.localVariablesExposedToChild(wrappedNode).stream() - .filter(vd -> vd.getNameAsString().equals(name)) - .findFirst(); + Optional localResolutionResults = parentContext.localVariablesExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst(); if (localResolutionResults.isPresent()) { return localResolutionResults; } @@ -286,9 +281,7 @@ default Optional parameterDeclarationInScope(String name) { // First check if the parameter is directly declared within this context. Node wrappedNode = getWrappedNode(); Context parentContext = getParent().get(); - Optional localResolutionResults = parentContext.parametersExposedToChild(wrappedNode).stream() - .filter(vd -> vd.getNameAsString().equals(name)) - .findFirst(); + Optional localResolutionResults = parentContext.parametersExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst(); if (localResolutionResults.isPresent()) { return localResolutionResults; } @@ -324,10 +317,7 @@ default Optional typePatternExprInScope(String name) { // FIXME: If there are multiple patterns, throw an error? // First check if the pattern is directly declared within this context. Node wrappedNode = getWrappedNode(); - Optional localResolutionResults = - parentContext.typePatternExprsExposedToChild(wrappedNode).stream() - .filter(vd -> vd.getNameAsString().equals(name)) - .findFirst(); + Optional localResolutionResults = parentContext.typePatternExprsExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst(); if (localResolutionResults.isPresent()) { return localResolutionResults; } @@ -342,10 +332,7 @@ default Optional fieldDeclarationInScope(String name) Context parentContext = getParent().get(); // First check if the parameter is directly declared within this context. Node wrappedNode = getWrappedNode(); - Optional localResolutionResults = - parentContext.fieldsExposedToChild(wrappedNode).stream() - .filter(vd -> vd.getName().equals(name)) - .findFirst(); + Optional localResolutionResults = parentContext.fieldsExposedToChild(wrappedNode).stream().filter(vd -> vd.getName().equals(name)).findFirst(); if (localResolutionResults.isPresent()) { return localResolutionResults; } @@ -365,14 +352,12 @@ default SymbolReference solveConstructor(List solveMethod( - String name, List argumentsTypes, boolean staticOnly) { + default SymbolReference solveMethod(String name, List argumentsTypes, boolean staticOnly) { // Default to solving within the parent context. return solveMethodInParentContext(name, argumentsTypes, staticOnly); } - default SymbolReference solveMethodInParentContext( - String name, List argumentsTypes, boolean staticOnly) { + default SymbolReference solveMethodInParentContext(String name, List argumentsTypes, boolean staticOnly) { Optional optionalParentContext = getParent(); if (!optionalParentContext.isPresent()) { return SymbolReference.unsolved(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodAmbiguityException.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodAmbiguityException.java index e927a84e6a..c26f2eab78 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodAmbiguityException.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodAmbiguityException.java @@ -25,12 +25,12 @@ * * @author Federico Tomassetti */ -public class MethodAmbiguityException extends RuntimeException { +public class MethodAmbiguityException extends RuntimeException { /** * Create an instance from a description of the reason why there is ambiguity in this particular case. */ - public MethodAmbiguityException(String description) { + public MethodAmbiguityException(String description) { super(description); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java index 4b06008d3d..86a5ff84e8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java @@ -34,7 +34,7 @@ * * @author Federico Tomassetti */ -public class MethodUsage implements ResolvedTypeParametrized { +public class MethodUsage implements ResolvedTypeParametrized { private ResolvedMethodDeclaration declaration; @@ -46,7 +46,7 @@ public class MethodUsage implements ResolvedTypeParametrized { private ResolvedTypeParametersMap typeParametersMap; - public MethodUsage(ResolvedMethodDeclaration declaration) { + public MethodUsage(ResolvedMethodDeclaration declaration) { this.typeParametersMap = ResolvedTypeParametersMap.empty(); this.declaration = declaration; paramTypes.addAll(declaration.formalParameterTypes()); @@ -54,29 +54,15 @@ public MethodUsage(ResolvedMethodDeclaration declaration) { returnType = declaration.getReturnType(); } - public MethodUsage(ResolvedMethodDeclaration declaration, List paramTypes, ResolvedType returnType) { - this( - declaration, - paramTypes, - returnType, - declaration.getSpecifiedExceptions(), - ResolvedTypeParametersMap.empty()); + public MethodUsage(ResolvedMethodDeclaration declaration, List paramTypes, ResolvedType returnType) { + this(declaration, paramTypes, returnType, declaration.getSpecifiedExceptions(), ResolvedTypeParametersMap.empty()); } - public MethodUsage( - ResolvedMethodDeclaration declaration, - List paramTypes, - ResolvedType returnType, - List exceptionTypes) { + public MethodUsage(ResolvedMethodDeclaration declaration, List paramTypes, ResolvedType returnType, List exceptionTypes) { this(declaration, paramTypes, returnType, exceptionTypes, ResolvedTypeParametersMap.empty()); } - private MethodUsage( - ResolvedMethodDeclaration declaration, - List paramTypes, - ResolvedType returnType, - List exceptionTypes, - ResolvedTypeParametersMap typeParametersMap) { + private MethodUsage(ResolvedMethodDeclaration declaration, List paramTypes, ResolvedType returnType, List exceptionTypes, ResolvedTypeParametersMap typeParametersMap) { this.declaration = declaration; this.paramTypes = paramTypes; this.returnType = returnType; @@ -85,31 +71,31 @@ private MethodUsage( } @Override - public String toString() { + public String toString() { return "MethodUsage{" + "declaration=" + declaration + ", paramTypes=" + paramTypes + '}'; } - public ResolvedMethodDeclaration getDeclaration() { + public ResolvedMethodDeclaration getDeclaration() { return declaration; } - public String getName() { + public String getName() { return declaration.getName(); } - public ResolvedReferenceTypeDeclaration declaringType() { + public ResolvedReferenceTypeDeclaration declaringType() { return declaration.declaringType(); } - public ResolvedType returnType() { + public ResolvedType returnType() { return returnType; } - public List getParamTypes() { + public List getParamTypes() { return paramTypes; } - public MethodUsage replaceParamType(int i, ResolvedType replaced) { + public MethodUsage replaceParamType(int i, ResolvedType replaced) { if (i < 0 || i >= getNoParams()) { throw new IllegalArgumentException(); } @@ -121,7 +107,7 @@ public MethodUsage replaceParamType(int i, ResolvedType replaced) { return new MethodUsage(declaration, newParams, returnType, exceptionTypes, typeParametersMap); } - public MethodUsage replaceExceptionType(int i, ResolvedType replaced) { + public MethodUsage replaceExceptionType(int i, ResolvedType replaced) { if (i < 0 || i >= exceptionTypes.size()) { throw new IllegalArgumentException(); } @@ -133,7 +119,7 @@ public MethodUsage replaceExceptionType(int i, ResolvedType replaced) { return new MethodUsage(declaration, paramTypes, returnType, newTypes, typeParametersMap); } - public MethodUsage replaceReturnType(ResolvedType returnType) { + public MethodUsage replaceReturnType(ResolvedType returnType) { if (returnType == this.returnType) { return this; } @@ -143,28 +129,23 @@ public MethodUsage replaceReturnType(ResolvedType returnType) { /** * Return the number of formal arguments accepted by this method. */ - public int getNoParams() { + public int getNoParams() { return paramTypes.size(); } /** * Return the type of the formal argument at the given position. */ - public ResolvedType getParamType(int i) { + public ResolvedType getParamType(int i) { return paramTypes.get(i); } - public MethodUsage replaceTypeParameter(ResolvedTypeParameterDeclaration typeParameter, ResolvedType type) { + public MethodUsage replaceTypeParameter(ResolvedTypeParameterDeclaration typeParameter, ResolvedType type) { if (type == null) { throw new IllegalArgumentException(); } // TODO if the method declaration has a type param with that name ignore this call - MethodUsage res = new MethodUsage( - declaration, - paramTypes, - returnType, - exceptionTypes, - typeParametersMap.toBuilder().setValue(typeParameter, type).build()); + MethodUsage res = new MethodUsage(declaration, paramTypes, returnType, exceptionTypes, typeParametersMap.toBuilder().setValue(typeParameter, type).build()); Map inferredTypes = new HashMap<>(); for (int i = 0; i < paramTypes.size(); i++) { ResolvedType originalParamType = paramTypes.get(i); @@ -183,7 +164,7 @@ public MethodUsage replaceTypeParameter(ResolvedTypeParameterDeclaration typePar } @Override - public ResolvedTypeParametersMap typeParametersMap() { + public ResolvedTypeParametersMap typeParametersMap() { return typeParametersMap; } @@ -191,14 +172,14 @@ public ResolvedTypeParametersMap typeParametersMap() { * The qualified signature of the method. It is composed by the qualified name of the declaring type * followed by the signature of the method. */ - public String getQualifiedSignature() { + public String getQualifiedSignature() { return getDeclaration().declaringType().getQualifiedName() + "." + getSignature(); } /** * The signature of the method. */ - public String getSignature() { + public String getSignature() { StringBuilder sb = new StringBuilder(); sb.append(getName()); sb.append("("); @@ -220,7 +201,7 @@ public String getSignature() { /** * The erased signature of the method. */ - public String getErasedSignature() { + public String getErasedSignature() { StringBuilder sb = new StringBuilder(); sb.append(getName()); sb.append("("); @@ -239,7 +220,7 @@ public String getErasedSignature() { return sb.toString(); } - public List exceptionTypes() { + public List exceptionTypes() { return exceptionTypes; } @@ -251,7 +232,7 @@ public List exceptionTypes() { * https://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html * This method returns an approximation of this rule. */ - public boolean isSameSignature(MethodUsage otherMethodUsage) { + public boolean isSameSignature(MethodUsage otherMethodUsage) { return getSignature().equals(otherMethodUsage.getSignature()); } @@ -260,7 +241,7 @@ public boolean isSameSignature(MethodUsage otherMethodUsage) { * m2 has the same signature as m1, or * the signature of m1 is the same as the erasure (§4.6) of the signature of m2. */ - public boolean isSubSignature(MethodUsage otherMethodUsage) { + public boolean isSubSignature(MethodUsage otherMethodUsage) { return getErasedSignature().equals(otherMethodUsage.getErasedSignature()); } @@ -273,8 +254,7 @@ public boolean isSubSignature(MethodUsage otherMethodUsage) { * R1 can be converted to a subtype of R2 by unchecked conversion (§5.1.9). * d1 does not have the same signature as d2 (§8.4.2), and R1 = |R2|. */ - public boolean isReturnTypeSubstituable(MethodUsage otherMethodUsage) { - return getDeclaration() - .isReturnTypeSubstituable(otherMethodUsage.getDeclaration().getReturnType()); + public boolean isReturnTypeSubstituable(MethodUsage otherMethodUsage) { + return getDeclaration().isReturnTypeSubstituable(otherMethodUsage.getDeclaration().getReturnType()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java index bd52ece53a..39f23a883d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java @@ -52,13 +52,8 @@ public static ClassOrInterfaceDeclaration demandClass(CompilationUnit cu, String return cd; } - public static ClassOrInterfaceDeclaration demandClassOrInterface( - CompilationUnit compilationUnit, String qualifiedName) { - return findType(compilationUnit, qualifiedName) - .map(res -> res.toClassOrInterfaceDeclaration() - .orElseThrow(() -> new IllegalStateException("Type is not a class or an interface, it is " - + res.getClass().getCanonicalName()))) - .orElseThrow(() -> new IllegalStateException("No type named '" + qualifiedName + "'found")); + public static ClassOrInterfaceDeclaration demandClassOrInterface(CompilationUnit compilationUnit, String qualifiedName) { + return findType(compilationUnit, qualifiedName).map(res -> res.toClassOrInterfaceDeclaration().orElseThrow(() -> new IllegalStateException("Type is not a class or an interface, it is " + res.getClass().getCanonicalName()))).orElseThrow(() -> new IllegalStateException("No type named '" + qualifiedName + "'found")); } /** @@ -147,9 +142,7 @@ public static N demandNodeOfGivenClass(Node node, Class claz } public static Node demandParentNode(Node node) { - return node.getParentNode() - .orElseThrow(() -> new IllegalStateException( - "Parent not found, the node does not appear to be inserted in a correct AST")); + return node.getParentNode().orElseThrow(() -> new IllegalStateException("Parent not found, the node does not appear to be inserted in a correct AST")); } /** @@ -231,9 +224,7 @@ public static Optional> findType(CompilationUnit cu, String q return Optional.empty(); } final String typeName = getOuterTypeName(qualifiedName); - Optional> type = cu.getTypes().stream() - .filter((t) -> t.getName().getId().equals(typeName)) - .findFirst(); + Optional> type = cu.getTypes().stream().filter((t) -> t.getName().getId().equals(typeName)).findFirst(); final String innerTypeName = getInnerTypeName(qualifiedName); if (type.isPresent() && !innerTypeName.isEmpty()) { return findType(type.get(), innerTypeName); @@ -251,8 +242,7 @@ public static Optional> findType(TypeDeclaration td, Strin final String typeName = getOuterTypeName(qualifiedName); Optional> type = Optional.empty(); for (Node n : td.getMembers()) { - if (n instanceof TypeDeclaration - && ((TypeDeclaration) n).getName().getId().equals(typeName)) { + if (n instanceof TypeDeclaration && ((TypeDeclaration) n).getName().getId().equals(typeName)) { type = Optional.of((TypeDeclaration) n); break; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Resolvable.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Resolvable.java index c3568edec5..850b5882df 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Resolvable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Resolvable.java @@ -20,7 +20,7 @@ */ package com.github.javaparser.resolution; -public interface Resolvable { +public interface Resolvable { T resolve(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java index f6e1a2c87f..a2ace78773 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Optional; -public interface Solver { +public interface Solver { SymbolReference solveSymbol(String name, Context context); @@ -57,8 +57,7 @@ public interface Solver { *

    * It should contain its own private fields but not inherited private fields. */ - SymbolReference solveSymbolInType( - ResolvedTypeDeclaration typeDeclaration, String name); + SymbolReference solveSymbolInType(ResolvedTypeDeclaration typeDeclaration, String name); /** * Try to solve a symbol just in the declaration, it does not delegate to the container. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolDeclarator.java index 7ff1b3cadf..6bd51024f8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolDeclarator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolDeclarator.java @@ -26,7 +26,7 @@ /** * @author Federico Tomassetti */ -public interface SymbolDeclarator { +public interface SymbolDeclarator { List getSymbolDeclarations(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolResolver.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolResolver.java index 1a93ae6fc0..c19b7353d9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolResolver.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/SymbolResolver.java @@ -26,7 +26,7 @@ import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; import com.github.javaparser.resolution.types.ResolvedType; -public interface SymbolResolver { +public interface SymbolResolver { /** * For a reference it would find the corresponding declaration. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java index 8787f39e75..c6136bc4ef 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java @@ -29,7 +29,7 @@ * * @author Federico Tomassetti */ -public interface TypeSolver { +public interface TypeSolver { String JAVA_LANG_OBJECT = Object.class.getCanonicalName(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java index 49392b3be8..4fb6e33dfa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public class UnsolvedSymbolException extends RuntimeException { +public class UnsolvedSymbolException extends RuntimeException { /** * The name of the symbol that could not be resolved. @@ -44,32 +44,31 @@ public class UnsolvedSymbolException extends RuntimeException { */ private Throwable cause; - public UnsolvedSymbolException(String name) { + public UnsolvedSymbolException(String name) { this(name, null, null); } - public UnsolvedSymbolException(String name, String context) { + public UnsolvedSymbolException(String name, String context) { this(name, context, null); } - public UnsolvedSymbolException(String name, Throwable cause) { + public UnsolvedSymbolException(String name, Throwable cause) { this(name, null, cause); } - public UnsolvedSymbolException(String name, String context, Throwable cause) { + public UnsolvedSymbolException(String name, String context, Throwable cause) { super("Unsolved symbol" + (context != null ? " in " + context : "") + " : " + name, cause); this.name = name; this.context = context; this.cause = cause; } - public String getName() { + public String getName() { return name; } @Override - public String toString() { - return "UnsolvedSymbolException{" + "context='" + context + "'" + ", name='" + name + "'" + ", cause='" + cause - + "'" + "}"; + public String toString() { + return "UnsolvedSymbolException{" + "context='" + context + "'" + ", name='" + name + "'" + ", cause='" + cause + "'" + "}"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/Cache.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/Cache.java index 076c97c0e4..c2b91b94e9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/Cache.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/Cache.java @@ -31,7 +31,7 @@ * @param The type of the key. * @param The type of the value. */ -public interface Cache { +public interface Cache { /** * Associates value with key in this cache. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/CacheStats.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/CacheStats.java index b3a7609624..c5b2de6ef4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/CacheStats.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/cache/CacheStats.java @@ -19,7 +19,7 @@ */ package com.github.javaparser.resolution.cache; -public interface CacheStats { +public interface CacheStats { /** * Returns the number of times lookup methods have returned either a cached or diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/AssociableToAST.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/AssociableToAST.java index 7433f2a703..065cb18b69 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/AssociableToAST.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/AssociableToAST.java @@ -26,7 +26,7 @@ /** * A declaration that can be potentially associated with an AST node. */ -public interface AssociableToAST { +public interface AssociableToAST { /** * If the declaration is associated to an AST node return it, otherwise it return empty. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/HasAccessSpecifier.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/HasAccessSpecifier.java index 3c784c0a4e..c547bba45a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/HasAccessSpecifier.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/HasAccessSpecifier.java @@ -28,7 +28,7 @@ * @author Federico Tomassetti * @see AccessSpecifier */ -public interface HasAccessSpecifier { +public interface HasAccessSpecifier { /** * The access specifier of this element. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclaration.java index 3ff2d480bf..08abaf736e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclaration.java @@ -25,7 +25,7 @@ /** * @author Federico Tomassetti */ -public interface ResolvedAnnotationDeclaration extends ResolvedReferenceTypeDeclaration { +public interface ResolvedAnnotationDeclaration extends ResolvedReferenceTypeDeclaration { @Override default boolean isAnnotation() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclaration.java index 8a839c6d75..8767cba090 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclaration.java @@ -25,7 +25,7 @@ /** * @author Federico Tomassetti */ -public interface ResolvedAnnotationMemberDeclaration extends ResolvedValueDeclaration { +public interface ResolvedAnnotationMemberDeclaration extends ResolvedValueDeclaration { Expression getDefaultValue(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java index 7f055b0f75..b5cabc21ee 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java @@ -32,8 +32,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedClassDeclaration - extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { +public interface ResolvedClassDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { /** * This method should always return true. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclaration.java index 34fa137882..6465f95436 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclaration.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedConstructorDeclaration extends ResolvedMethodLikeDeclaration { +public interface ResolvedConstructorDeclaration extends ResolvedMethodLikeDeclaration { /** * A constructor can be declared in a class or an enum. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java index 25a896719f..2e12c46793 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedDeclaration.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedDeclaration extends AssociableToAST { +public interface ResolvedDeclaration extends AssociableToAST { /** * Anonymous classes do not have a name, for example. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclaration.java index ce173d563d..b68f9f1735 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclaration.java @@ -23,7 +23,7 @@ /** * @author Federico Tomassetti */ -public interface ResolvedEnumConstantDeclaration extends ResolvedValueDeclaration { +public interface ResolvedEnumConstantDeclaration extends ResolvedValueDeclaration { String getName(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java index 43f4bcecfc..e9e7bc7466 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java @@ -27,7 +27,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedEnumDeclaration extends ResolvedReferenceTypeDeclaration, HasAccessSpecifier { +public interface ResolvedEnumDeclaration extends ResolvedReferenceTypeDeclaration, HasAccessSpecifier { @Override default boolean isEnum() { @@ -46,9 +46,6 @@ default boolean hasEnumConstant(String name) { } default ResolvedEnumConstantDeclaration getEnumConstant(final String name) { - return getEnumConstants().stream() - .filter(c -> c.getName().equals(name)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("No constant named " + name)); + return getEnumConstants().stream().filter(c -> c.getName().equals(name)).findFirst().orElseThrow(() -> new IllegalArgumentException("No constant named " + name)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclaration.java index fd4fec0e4f..8e7940a6f8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclaration.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedFieldDeclaration extends ResolvedValueDeclaration, HasAccessSpecifier { +public interface ResolvedFieldDeclaration extends ResolvedValueDeclaration, HasAccessSpecifier { /** * Is the field static? diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java index 4fdd9515b4..baf4e80a69 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java @@ -29,8 +29,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedInterfaceDeclaration - extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { +public interface ResolvedInterfaceDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { @Override default boolean isInterface() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclaration.java index c845dd83c3..5fd3535527 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclaration.java @@ -27,7 +27,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedMethodDeclaration extends ResolvedMethodLikeDeclaration { +public interface ResolvedMethodDeclaration extends ResolvedMethodLikeDeclaration { /** * The type of the value returned by the current method. This method can also be invoked diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java index 68dea521ea..704c87c7aa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java @@ -31,8 +31,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedMethodLikeDeclaration - extends ResolvedDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { +public interface ResolvedMethodLikeDeclaration extends ResolvedDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { /** * The package name of the declaring type. @@ -103,8 +102,7 @@ default String getQualifiedSignature() { */ default ResolvedParameterDeclaration getLastParam() { if (getNumberOfParams() == 0) { - throw new UnsupportedOperationException( - "This method has no typeParametersValues, therefore it has no a last parameter"); + throw new UnsupportedOperationException("This method has no typeParametersValues, therefore it has no a last parameter"); } return getParam(getNumberOfParams() - 1); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclaration.java index f60e8f1a5a..43139c4328 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclaration.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedParameterDeclaration extends ResolvedValueDeclaration { +public interface ResolvedParameterDeclaration extends ResolvedValueDeclaration { @Override default boolean isParameter() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java index 3f27df4a5a..9178ae936b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java @@ -33,8 +33,7 @@ * @author Federico Tomassetti * @author Johannes Coetzee */ -public interface ResolvedRecordDeclaration - extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { +public interface ResolvedRecordDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier { @Override default boolean isRecord() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java index dd0c91cdd9..431d2889ec 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java @@ -33,7 +33,7 @@ /** * @author Federico Tomassetti */ -public interface ResolvedReferenceTypeDeclaration extends ResolvedTypeDeclaration, ResolvedTypeParametrizable { +public interface ResolvedReferenceTypeDeclaration extends ResolvedTypeDeclaration, ResolvedTypeParametrizable { String JAVA_LANG_ENUM = java.lang.Enum.class.getCanonicalName(); @@ -114,8 +114,7 @@ default List getAllAncestors() { * if A inherits from B, and B inherits from C and implements D, and C inherits from E * Apply the specified traversal */ - default List getAllAncestors( - Function> traverser) { + default List getAllAncestors(Function> traverser) { return traverser.apply(this); } @@ -152,16 +151,14 @@ default List getAllAncestors( ancestors.addAll(queuedAncestors); while (!queuedAncestors.isEmpty()) { ResolvedReferenceType queuedAncestor = queuedAncestors.removeFirst(); - queuedAncestor.getTypeDeclaration().ifPresent(rtd -> new LinkedHashSet<>( - queuedAncestor.getDirectAncestors()) - .stream().forEach(ancestor -> { - // add this ancestor to the queue (for a deferred search) - queuedAncestors.add(ancestor); - // add this ancestor to the list of ancestors - if (!ancestors.contains(ancestor)) { - ancestors.add(ancestor); - } - })); + queuedAncestor.getTypeDeclaration().ifPresent(rtd -> new LinkedHashSet<>(queuedAncestor.getDirectAncestors()).stream().forEach(ancestor -> { + // add this ancestor to the queue (for a deferred search) + queuedAncestors.add(ancestor); + // add this ancestor to the list of ancestors + if (!ancestors.contains(ancestor)) { + ancestors.add(ancestor); + } + })); } } return ancestors; @@ -182,9 +179,7 @@ default List getAllAncestors( * Bar I should get a FieldDeclaration with type String. */ default ResolvedFieldDeclaration getField(String name) { - Optional field = this.getAllFields().stream() - .filter(f -> f.getName().equals(name)) - .findFirst(); + Optional field = this.getAllFields().stream().filter(f -> f.getName().equals(name)).findFirst(); if (field.isPresent()) { return field.get(); } @@ -195,9 +190,7 @@ default ResolvedFieldDeclaration getField(String name) { * Consider only field or inherited field which is not private. */ default ResolvedFieldDeclaration getVisibleField(String name) { - Optional field = getVisibleFields().stream() - .filter(f -> f.getName().equals(name)) - .findFirst(); + Optional field = getVisibleFields().stream().filter(f -> f.getName().equals(name)).findFirst(); if (field.isPresent()) { return field.get(); } @@ -227,9 +220,7 @@ default boolean hasVisibleField(String name) { * Return a list of all fields declared and the inherited ones which are not private. */ default List getVisibleFields() { - return getAllFields().stream() - .filter(f -> f.declaringType().equals(this) || f.accessSpecifier() != AccessSpecifier.PRIVATE) - .collect(Collectors.toList()); + return getAllFields().stream().filter(f -> f.declaringType().equals(this) || f.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList()); } /** @@ -250,9 +241,7 @@ default List getAllStaticFields() { * Return a list of all the fields declared in this type. */ default List getDeclaredFields() { - return getAllFields().stream() - .filter(it -> it.declaringType().getQualifiedName().equals(getQualifiedName())) - .collect(Collectors.toList()); + return getAllFields().stream().filter(it -> it.declaringType().getQualifiedName().equals(getQualifiedName())).collect(Collectors.toList()); } // / @@ -309,14 +298,7 @@ default boolean hasAnnotation(String qualifiedName) { if (hasDirectlyAnnotation(qualifiedName)) { return true; } - return isClass() - && getAllAncestors().stream() - .filter(it -> it.asReferenceType().getTypeDeclaration().isPresent()) - .filter(it -> - it.asReferenceType().getTypeDeclaration().get().isClass()) - .map(it -> it.asReferenceType().getTypeDeclaration().get()) - .anyMatch(rrtd -> - rrtd.hasDirectlyAnnotation(qualifiedName) && rrtd.isInheritedAnnotation(qualifiedName)); + return isClass() && getAllAncestors().stream().filter(it -> it.asReferenceType().getTypeDeclaration().isPresent()).filter(it -> it.asReferenceType().getTypeDeclaration().get().isClass()).map(it -> it.asReferenceType().getTypeDeclaration().get()).anyMatch(rrtd -> rrtd.hasDirectlyAnnotation(qualifiedName) && rrtd.isInheritedAnnotation(qualifiedName)); } /** @@ -331,17 +313,14 @@ default boolean isInheritedAnnotation(String name) { * Returns the resolved annotation corresponding to the specified name and declared in this type declaration. */ default Optional getDeclaredAnnotation(String name) { - return getDeclaredAnnotations().stream() - .filter(annotation -> annotation.getQualifiedName().endsWith(name)) - .findFirst(); + return getDeclaredAnnotations().stream().filter(annotation -> annotation.getQualifiedName().endsWith(name)).findFirst(); } /** * Return a collection of all annotations declared in this type declaration. */ default Set getDeclaredAnnotations() { - throw new UnsupportedOperationException( - "Getting declared annotation is not supproted on this type " + this.getName()); + throw new UnsupportedOperationException("Getting declared annotation is not supproted on this type " + this.getName()); } /** @@ -377,11 +356,8 @@ default Optional findTypeParameter(String name * @see https://github.com/javaparser/javaparser/issues/2044 */ default boolean isJavaLangObject() { - return this.isClass() - && !isAnonymousClass() - && // Consider anonymous classes - hasName() - && JAVA_LANG_OBJECT.equals(getQualifiedName()); + return this.isClass() && !isAnonymousClass() && // Consider anonymous classes + hasName() && JAVA_LANG_OBJECT.equals(getQualifiedName()); } /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java index f329527012..1597b03ea9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java @@ -31,7 +31,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedTypeDeclaration extends ResolvedDeclaration { +public interface ResolvedTypeDeclaration extends ResolvedDeclaration { // / // / Containment @@ -40,8 +40,7 @@ public interface ResolvedTypeDeclaration extends ResolvedDeclaration { * Get the list of types defined inside the current type. */ default Set internalTypes() { - throw new UnsupportedOperationException( - "InternalTypes not available for " + this.getClass().getCanonicalName()); + throw new UnsupportedOperationException("InternalTypes not available for " + this.getClass().getCanonicalName()); } /** @@ -49,9 +48,7 @@ default Set internalTypes() { * (Does not include internal types inside internal types). */ default ResolvedReferenceTypeDeclaration getInternalType(String name) { - Optional type = this.internalTypes().stream() - .filter(f -> f.getName().equals(name)) - .findFirst(); + Optional type = this.internalTypes().stream().filter(f -> f.getName().equals(name)).findFirst(); return type.orElseThrow(() -> new UnsolvedSymbolException("Internal type not found: " + name)); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java index f5ddddd7d6..a25bdb506b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java @@ -36,7 +36,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedTypeParameterDeclaration extends ResolvedTypeDeclaration { +public interface ResolvedTypeParameterDeclaration extends ResolvedTypeDeclaration { /** * Instantiate a TypeParameter defined on a Type with the given data. @@ -45,57 +45,57 @@ static ResolvedTypeParameterDeclaration onType(final String name, String classQN return new ResolvedTypeParameterDeclaration() { @Override - public String getName() { + public String getName() { return name; } @Override - public boolean declaredOnType() { + public boolean declaredOnType() { return true; } @Override - public boolean declaredOnMethod() { + public boolean declaredOnMethod() { return false; } @Override - public boolean declaredOnConstructor() { + public boolean declaredOnConstructor() { return false; } @Override - public String getContainerQualifiedName() { + public String getContainerQualifiedName() { return classQName; } @Override - public String getContainerId() { + public String getContainerId() { return classQName; } @Override - public ResolvedTypeParametrizable getContainer() { + public ResolvedTypeParametrizable getContainer() { return null; } @Override - public List getBounds() { + public List getBounds() { return bounds; } @Override - public String toString() { + public String toString() { return "TypeParameter onType " + name; } @Override - public Optional containerType() { + public Optional containerType() { throw new UnsupportedOperationException(); } @Override - public ResolvedReferenceType object() { + public ResolvedReferenceType object() { throw new UnsupportedOperationException(); } }; @@ -303,40 +303,43 @@ public static Bound superBound(ResolvedType type) { /** * Get the type used in the Bound. */ - public ResolvedType getType() { + public ResolvedType getType() { return type; } /** * Is this an extends bound? */ - public boolean isExtends() { + public boolean isExtends() { return extendsBound; } /** * Is this a super bound? */ - public boolean isSuper() { + public boolean isSuper() { return !isExtends(); } @Override - public String toString() { + public String toString() { return "Bound{" + "extendsBound=" + extendsBound + ", type=" + type + '}'; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Bound bound = (Bound) o; - if (extendsBound != bound.extendsBound) return false; + if (extendsBound != bound.extendsBound) + return false; return type != null ? type.equals(bound.type) : bound.type == null; } @Override - public int hashCode() { + public int hashCode() { int result = (extendsBound ? 1 : 0); result = 31 * result + (type != null ? type.hashCode() : 0); return result; diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizable.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizable.java index e91b06024b..c55d40df91 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizable.java @@ -28,7 +28,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedTypeParametrizable { +public interface ResolvedTypeParametrizable { /** * The list of type parameters defined on this element. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclaration.java index 00cfba4358..4172609ddd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclaration.java @@ -30,7 +30,7 @@ * @author Roger Howell * @see TypePatternExpr */ -public interface ResolvedTypePatternDeclaration extends ResolvedValueDeclaration { +public interface ResolvedTypePatternDeclaration extends ResolvedValueDeclaration { @Override default boolean isTypePattern() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclaration.java index 231a7f7aad..a8f41ed4a1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclaration.java @@ -27,7 +27,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedValueDeclaration extends ResolvedDeclaration { +public interface ResolvedValueDeclaration extends ResolvedDeclaration { /** * Type of the declaration. diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConflictingGenericTypesException.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConflictingGenericTypesException.java index 66adad5416..6c05c7bc52 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConflictingGenericTypesException.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConflictingGenericTypesException.java @@ -25,9 +25,9 @@ /** * @author Federico Tomassetti */ -public class ConflictingGenericTypesException extends RuntimeException { +public class ConflictingGenericTypesException extends RuntimeException { - public ConflictingGenericTypesException(ResolvedType formalType, ResolvedType actualType) { + public ConflictingGenericTypesException(ResolvedType formalType, ResolvedType actualType) { super(String.format("No matching between %s (formal) and %s (actual)", formalType, actualType)); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java index 5d3064f951..d1dbc93eca 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java @@ -36,10 +36,9 @@ /** * @author Fred Lefévère-Laoide */ -public class ConstructorResolutionLogic { +public class ConstructorResolutionLogic { - private static List groupVariadicParamValues( - List argumentsTypes, int startVariadic, ResolvedType variadicType) { + private static List groupVariadicParamValues(List argumentsTypes, int startVariadic, ResolvedType variadicType) { List res = new ArrayList<>(argumentsTypes.subList(0, startVariadic)); List variadicValues = argumentsTypes.subList(startVariadic, argumentsTypes.size()); if (variadicValues.isEmpty()) { @@ -60,16 +59,11 @@ private static ResolvedType findCommonType(List variadicValues) { return variadicValues.get(0); } - public static boolean isApplicable( - ResolvedConstructorDeclaration constructor, List argumentsTypes, TypeSolver typeSolver) { + public static boolean isApplicable(ResolvedConstructorDeclaration constructor, List argumentsTypes, TypeSolver typeSolver) { return isApplicable(constructor, argumentsTypes, typeSolver, false); } - private static boolean isApplicable( - ResolvedConstructorDeclaration constructor, - List argumentsTypes, - TypeSolver typeSolver, - boolean withWildcardTolerance) { + private static boolean isApplicable(ResolvedConstructorDeclaration constructor, List argumentsTypes, TypeSolver typeSolver, boolean withWildcardTolerance) { if (constructor.hasVariadicParameter()) { int pos = constructor.getNumberOfParams() - 1; if (constructor.getNumberOfParams() == argumentsTypes.size()) { @@ -81,15 +75,10 @@ private static boolean isApplicable( expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver); } if (!expectedType.isAssignableBy(actualType)) { - if (actualType.isArray() - && expectedType.isAssignableBy( - actualType.asArrayType().getComponentType())) { + if (actualType.isArray() && expectedType.isAssignableBy(actualType.asArrayType().getComponentType())) { argumentsTypes.set(pos, actualType.asArrayType().getComponentType()); } else { - argumentsTypes = groupVariadicParamValues( - argumentsTypes, - pos, - constructor.getLastParam().getType()); + argumentsTypes = groupVariadicParamValues(argumentsTypes, pos, constructor.getLastParam().getType()); } } } @@ -98,8 +87,7 @@ private static boolean isApplicable( if (pos > argumentsTypes.size()) { return false; } - argumentsTypes = groupVariadicParamValues( - argumentsTypes, pos, constructor.getLastParam().getType()); + argumentsTypes = groupVariadicParamValues(argumentsTypes, pos, constructor.getLastParam().getType()); } } if (constructor.getNumberOfParams() != argumentsTypes.size()) { @@ -110,24 +98,19 @@ private static boolean isApplicable( for (int i = 0; i < constructor.getNumberOfParams(); i++) { ResolvedType expectedType = constructor.getParam(i).getType(); ResolvedType actualType = argumentsTypes.get(i); - if ((expectedType.isTypeVariable() && !(expectedType.isWildcard())) - && expectedType.asTypeParameter().declaredOnMethod()) { + if ((expectedType.isTypeVariable() && !(expectedType.isWildcard())) && expectedType.asTypeParameter().declaredOnMethod()) { matchedParameters.put(expectedType.asTypeParameter().getName(), actualType); continue; } - boolean isAssignableWithoutSubstitution = expectedType.isAssignableBy(actualType) - || (constructor.getParam(i).isVariadic() - && new ResolvedArrayType(expectedType).isAssignableBy(actualType)); + boolean isAssignableWithoutSubstitution = expectedType.isAssignableBy(actualType) || (constructor.getParam(i).isVariadic() && new ResolvedArrayType(expectedType).isAssignableBy(actualType)); if (!isAssignableWithoutSubstitution && expectedType.isReferenceType() && actualType.isReferenceType()) { - isAssignableWithoutSubstitution = MethodResolutionLogic.isAssignableMatchTypeParameters( - expectedType.asReferenceType(), actualType.asReferenceType(), matchedParameters); + isAssignableWithoutSubstitution = MethodResolutionLogic.isAssignableMatchTypeParameters(expectedType.asReferenceType(), actualType.asReferenceType(), matchedParameters); } if (!isAssignableWithoutSubstitution) { for (ResolvedTypeParameterDeclaration tp : constructor.getTypeParameters()) { expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver); } - for (ResolvedTypeParameterDeclaration tp : - constructor.declaringType().getTypeParameters()) { + for (ResolvedTypeParameterDeclaration tp : constructor.declaringType().getTypeParameters()) { expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver); } if (!expectedType.isAssignableBy(actualType)) { @@ -153,26 +136,16 @@ private static boolean isApplicable( * @param typeSolver * @return */ - public static SymbolReference findMostApplicable( - List constructors, - List argumentsTypes, - TypeSolver typeSolver) { - SymbolReference res = - findMostApplicable(constructors, argumentsTypes, typeSolver, false); + public static SymbolReference findMostApplicable(List constructors, List argumentsTypes, TypeSolver typeSolver) { + SymbolReference res = findMostApplicable(constructors, argumentsTypes, typeSolver, false); if (res.isSolved()) { return res; } return findMostApplicable(constructors, argumentsTypes, typeSolver, true); } - public static SymbolReference findMostApplicable( - List constructors, - List argumentsTypes, - TypeSolver typeSolver, - boolean wildcardTolerance) { - List applicableConstructors = constructors.stream() - .filter((m) -> isApplicable(m, argumentsTypes, typeSolver, wildcardTolerance)) - .collect(Collectors.toList()); + public static SymbolReference findMostApplicable(List constructors, List argumentsTypes, TypeSolver typeSolver, boolean wildcardTolerance) { + List applicableConstructors = constructors.stream().filter((m) -> isApplicable(m, argumentsTypes, typeSolver, wildcardTolerance)).collect(Collectors.toList()); if (applicableConstructors.isEmpty()) { return SymbolReference.unsolved(); } @@ -190,10 +163,7 @@ public static SymbolReference findMostApplicable possibleAmbiguity = false; winningCandidate = other; } else { - if (winningCandidate - .declaringType() - .getQualifiedName() - .equals(other.declaringType().getQualifiedName())) { + if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) { possibleAmbiguity = true; } else { // we expect the methods to be ordered such that inherited methods are later in the list @@ -205,9 +175,7 @@ public static SymbolReference findMostApplicable if (MethodResolutionLogic.isExactMatch(other, argumentsTypes)) { winningCandidate = other; } else { - throw new MethodAmbiguityException( - "Ambiguous constructor call: cannot find a most applicable constructor: " - + winningCandidate + ", " + other); + throw new MethodAmbiguityException("Ambiguous constructor call: cannot find a most applicable constructor: " + winningCandidate + ", " + other); } } } @@ -215,10 +183,7 @@ public static SymbolReference findMostApplicable return SymbolReference.solved(winningCandidate); } - private static boolean isMoreSpecific( - ResolvedConstructorDeclaration constructorA, - ResolvedConstructorDeclaration constructorB, - TypeSolver typeSolver) { + private static boolean isMoreSpecific(ResolvedConstructorDeclaration constructorA, ResolvedConstructorDeclaration constructorB, TypeSolver typeSolver) { boolean oneMoreSpecificFound = false; if (constructorA.getNumberOfParams() < constructorB.getNumberOfParams()) { return true; diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java index ae8a626e56..684f35b2d4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java @@ -44,8 +44,7 @@ private FunctionalInterfaceLogic() { * Get the functional method defined by the type, if any. */ public static Optional getFunctionalMethod(ResolvedType type) { - Optional optionalTypeDeclaration = - type.asReferenceType().getTypeDeclaration(); + Optional optionalTypeDeclaration = type.asReferenceType().getTypeDeclaration(); if (!optionalTypeDeclaration.isPresent()) { return Optional.empty(); } @@ -61,12 +60,9 @@ public static Optional getFunctionalMethod(ResolvedType type) { */ public static Optional getFunctionalMethod(ResolvedReferenceTypeDeclaration typeDeclaration) { // We need to find all abstract methods - Set methods = typeDeclaration.getAllMethods().stream() - .filter(m -> m.getDeclaration().isAbstract()) - . // Remove methods inherited by Object: - // Consider the case of Comparator which define equals. It would be considered a functional method. - filter(m -> !isPublicMemberOfObject(m)) - .collect(Collectors.toSet()); + Set methods = typeDeclaration.getAllMethods().stream().filter(m -> m.getDeclaration().isAbstract()).// Remove methods inherited by Object: + // Consider the case of Comparator which define equals. It would be considered a functional method. + filter(m -> !isPublicMemberOfObject(m)).collect(Collectors.toSet()); // TODO a functional interface can have multiple subsignature method with a return-type-substitutable // see https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.8 if (methods.size() == 0) { @@ -76,9 +72,7 @@ public static Optional getFunctionalMethod(ResolvedReferenceTypeDec MethodUsage methodUsage = iterator.next(); while (iterator.hasNext()) { MethodUsage otherMethodUsage = iterator.next(); - if (!(methodUsage.isSameSignature(otherMethodUsage) - || methodUsage.isSubSignature(otherMethodUsage) - || otherMethodUsage.isSubSignature(methodUsage))) { + if (!(methodUsage.isSameSignature(otherMethodUsage) || methodUsage.isSubSignature(otherMethodUsage) || otherMethodUsage.isSubSignature(methodUsage))) { methodUsage = null; break; } @@ -92,10 +86,8 @@ public static Optional getFunctionalMethod(ResolvedReferenceTypeDec public static boolean isFunctionalInterfaceType(ResolvedType type) { if (type.isReferenceType()) { - Optional optionalTypeDeclaration = - type.asReferenceType().getTypeDeclaration(); - if (optionalTypeDeclaration.isPresent() - && optionalTypeDeclaration.get().hasAnnotation(JAVA_LANG_FUNCTIONAL_INTERFACE)) { + Optional optionalTypeDeclaration = type.asReferenceType().getTypeDeclaration(); + if (optionalTypeDeclaration.isPresent() && optionalTypeDeclaration.get().hasAnnotation(JAVA_LANG_FUNCTIONAL_INTERFACE)) { return true; } } @@ -103,24 +95,14 @@ public static boolean isFunctionalInterfaceType(ResolvedType type) { } private static String getSignature(Method m) { - return String.format( - "%s(%s)", - m.getName(), - String.join( - ", ", - Arrays.stream(m.getParameters()) - .map(p -> toSignature(p)) - .collect(Collectors.toList()))); + return String.format("%s(%s)", m.getName(), String.join(", ", Arrays.stream(m.getParameters()).map(p -> toSignature(p)).collect(Collectors.toList()))); } private static String toSignature(Parameter p) { return p.getType().getCanonicalName(); } - private static List OBJECT_PUBLIC_METHODS_SIGNATURES = Arrays.stream(Object.class.getDeclaredMethods()) - .filter(m -> Modifier.isPublic(m.getModifiers())) - .map(method -> getSignature(method)) - .collect(Collectors.toList()); + private static List OBJECT_PUBLIC_METHODS_SIGNATURES = Arrays.stream(Object.class.getDeclaredMethods()).filter(m -> Modifier.isPublic(m.getModifiers())).map(method -> getSignature(method)).collect(Collectors.toList()); private static boolean isPublicMemberOfObject(MethodUsage m) { return OBJECT_PUBLIC_METHODS_SIGNATURES.contains(m.getDeclaration().getSignature()); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java index 019da54f6e..8db11ee671 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java @@ -32,7 +32,7 @@ /** * @author Federico Tomassetti */ -public class InferenceContext { +public class InferenceContext { private int nextInferenceVariableId = 0; @@ -42,14 +42,13 @@ public class InferenceContext { private Map inferenceVariableTypeMap = new HashMap<>(); - public InferenceContext(TypeSolver typeSolver) { + public InferenceContext(TypeSolver typeSolver) { this.typeSolver = typeSolver; } private InferenceVariableType inferenceVariableTypeForTp(ResolvedTypeParameterDeclaration tp) { if (!inferenceVariableTypeMap.containsKey(tp.getName())) { - InferenceVariableType inferenceVariableType = - new InferenceVariableType(nextInferenceVariableId++, typeSolver); + InferenceVariableType inferenceVariableType = new InferenceVariableType(nextInferenceVariableId++, typeSolver); inferenceVariableTypes.add(inferenceVariableType); inferenceVariableType.setCorrespondingTp(tp); inferenceVariableTypeMap.put(tp.getName(), inferenceVariableType); @@ -60,14 +59,14 @@ private InferenceVariableType inferenceVariableTypeForTp(ResolvedTypeParameterDe /** * @return the actual with the inference variable inserted */ - public ResolvedType addPair(ResolvedType target, ResolvedType actual) { + public ResolvedType addPair(ResolvedType target, ResolvedType actual) { target = placeInferenceVariables(target); actual = placeInferenceVariables(actual); registerCorrespondance(target, actual); return target; } - public ResolvedType addSingle(ResolvedType actual) { + public ResolvedType addSingle(ResolvedType actual) { return placeInferenceVariables(actual); } @@ -81,23 +80,11 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual // Interfaces do not extend the class Object, // which means that if the formal parameter is of type Object, // all types can match including the actual type. - List correspondingFormalType = "java.lang.Object".equals(formalParamTypeQName) - ? Stream.concat( - new ArrayList(Arrays.asList(actualType)).stream(), - ancestors.stream() - .map(ancestor -> ancestor.asReferenceType()) - .collect(Collectors.toList()) - .stream()) - .collect(Collectors.toList()) - : ancestors.stream() - .filter((a) -> a.getQualifiedName().equals(formalParamTypeQName)) - .collect(Collectors.toList()); + List correspondingFormalType = "java.lang.Object".equals(formalParamTypeQName) ? Stream.concat(new ArrayList(Arrays.asList(actualType)).stream(), ancestors.stream().map(ancestor -> ancestor.asReferenceType()).collect(Collectors.toList()).stream()).collect(Collectors.toList()) : ancestors.stream().filter((a) -> a.getQualifiedName().equals(formalParamTypeQName)).collect(Collectors.toList()); if (correspondingFormalType.isEmpty()) { ancestors = formalTypeAsReference.getAllAncestors(); final String actualParamTypeQname = actualTypeAsReference.getQualifiedName(); - List correspondingActualType = ancestors.stream() - .filter(a -> a.getQualifiedName().equals(actualParamTypeQname)) - .collect(Collectors.toList()); + List correspondingActualType = ancestors.stream().filter(a -> a.getQualifiedName().equals(actualParamTypeQname)).collect(Collectors.toList()); if (correspondingActualType.isEmpty()) { throw new ConflictingGenericTypesException(formalType, actualType); } @@ -112,9 +99,7 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual } else { int i = 0; for (ResolvedType formalTypeParameter : formalTypeAsReference.typeParametersValues()) { - registerCorrespondance( - formalTypeParameter, - actualTypeAsReference.typeParametersValues().get(i)); + registerCorrespondance(formalTypeParameter, actualTypeAsReference.typeParametersValues().get(i)); i++; } } @@ -130,18 +115,13 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual } else if (actualType.equals(formalType)) { // nothing to do } else if (actualType.isArray() && formalType.isArray()) { - registerCorrespondance( - formalType.asArrayType().getComponentType(), - actualType.asArrayType().getComponentType()); + registerCorrespondance(formalType.asArrayType().getComponentType(), actualType.asArrayType().getComponentType()); } else if (formalType.isWildcard()) { // nothing to do - if ((actualType instanceof InferenceVariableType) - && formalType.asWildcard().isBounded()) { - ((InferenceVariableType) actualType) - .registerEquivalentType(formalType.asWildcard().getBoundedType()); + if ((actualType instanceof InferenceVariableType) && formalType.asWildcard().isBounded()) { + ((InferenceVariableType) actualType).registerEquivalentType(formalType.asWildcard().getBoundedType()); if (formalType.asWildcard().getBoundedType() instanceof InferenceVariableType) { - ((InferenceVariableType) formalType.asWildcard().getBoundedType()) - .registerEquivalentType(actualType); + ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualType); } } if (actualType.isWildcard()) { @@ -149,11 +129,9 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual ResolvedWildcard actualWildcard = actualType.asWildcard(); if (formalWildcard.isBounded() && formalWildcard.getBoundedType() instanceof InferenceVariableType) { if (formalWildcard.isSuper() && actualWildcard.isSuper()) { - ((InferenceVariableType) formalType.asWildcard().getBoundedType()) - .registerEquivalentType(actualWildcard.getBoundedType()); + ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualWildcard.getBoundedType()); } else if (formalWildcard.isExtends() && actualWildcard.isExtends()) { - ((InferenceVariableType) formalType.asWildcard().getBoundedType()) - .registerEquivalentType(actualWildcard.getBoundedType()); + ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualWildcard.getBoundedType()); } } } @@ -177,15 +155,13 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual if (formalType.isPrimitive()) { // nothing to do } else { - ResolvedReferenceTypeDeclaration resolvedTypedeclaration = - typeSolver.solveType(actualType.asPrimitive().getBoxTypeQName()); + ResolvedReferenceTypeDeclaration resolvedTypedeclaration = typeSolver.solveType(actualType.asPrimitive().getBoxTypeQName()); registerCorrespondance(formalType, new ReferenceTypeImpl(resolvedTypedeclaration)); } } else if (actualType.isReferenceType()) { if (formalType.isPrimitive()) { if (formalType.asPrimitive().getBoxTypeQName().equals(actualType.describe())) { - ResolvedReferenceTypeDeclaration resolvedTypedeclaration = - typeSolver.solveType(formalType.asPrimitive().getBoxTypeQName()); + ResolvedReferenceTypeDeclaration resolvedTypedeclaration = typeSolver.solveType(formalType.asPrimitive().getBoxTypeQName()); registerCorrespondance(new ReferenceTypeImpl(resolvedTypedeclaration), actualType); } else { // nothing to do @@ -208,12 +184,10 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual private ResolvedType placeInferenceVariables(ResolvedType type) { if (type.isWildcard()) { if (type.asWildcard().isExtends()) { - return ResolvedWildcard.extendsBound( - placeInferenceVariables(type.asWildcard().getBoundedType())); + return ResolvedWildcard.extendsBound(placeInferenceVariables(type.asWildcard().getBoundedType())); } if (type.asWildcard().isSuper()) { - return ResolvedWildcard.superBound( - placeInferenceVariables(type.asWildcard().getBoundedType())); + return ResolvedWildcard.superBound(placeInferenceVariables(type.asWildcard().getBoundedType())); } return type; } @@ -224,15 +198,13 @@ private ResolvedType placeInferenceVariables(ResolvedType type) { return type.asReferenceType().transformTypeParameters(tp -> placeInferenceVariables(tp)); } if (type.isArray()) { - return new ResolvedArrayType( - placeInferenceVariables(type.asArrayType().getComponentType())); + return new ResolvedArrayType(placeInferenceVariables(type.asArrayType().getComponentType())); } if (type.isNull() || type.isPrimitive() || type.isVoid()) { return type; } if (type.isConstraint()) { - return ResolvedLambdaConstraintType.bound( - placeInferenceVariables(type.asConstraintType().getBound())); + return ResolvedLambdaConstraintType.bound(placeInferenceVariables(type.asConstraintType().getBound())); } if (type instanceof InferenceVariableType) { return type; @@ -240,7 +212,7 @@ private ResolvedType placeInferenceVariables(ResolvedType type) { throw new UnsupportedOperationException(type.describe()); } - public ResolvedType resolve(ResolvedType type) { + public ResolvedType resolve(ResolvedType type) { if (type instanceof InferenceVariableType) { InferenceVariableType inferenceVariableType = (InferenceVariableType) type; return inferenceVariableType.equivalentType(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java index c342e4bc2a..1e397475e6 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java @@ -36,10 +36,10 @@ * * @author Federico Tomassetti */ -public class InferenceVariableType implements ResolvedType { +public class InferenceVariableType implements ResolvedType { @Override - public String toString() { + public String toString() { return "InferenceVariableType{" + "id=" + id + '}'; } @@ -47,7 +47,7 @@ public String toString() { private ResolvedTypeParameterDeclaration correspondingTp; - public void setCorrespondingTp(ResolvedTypeParameterDeclaration correspondingTp) { + public void setCorrespondingTp(ResolvedTypeParameterDeclaration correspondingTp) { this.correspondingTp = correspondingTp; } @@ -55,59 +55,56 @@ public void setCorrespondingTp(ResolvedTypeParameterDeclaration correspondingTp) private TypeSolver typeSolver; - public void registerEquivalentType(ResolvedType type) { + public void registerEquivalentType(ResolvedType type) { this.equivalentTypes.add(type); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof InferenceVariableType)) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof InferenceVariableType)) + return false; InferenceVariableType that = (InferenceVariableType) o; return id == that.id; } @Override - public int hashCode() { + public int hashCode() { return id; } private Set superTypes = new HashSet<>(); - public InferenceVariableType(int id, TypeSolver typeSolver) { + public InferenceVariableType(int id, TypeSolver typeSolver) { this.id = id; this.typeSolver = typeSolver; } @Override - public String describe() { + public String describe() { return "InferenceVariable_" + id; } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { throw new UnsupportedOperationException(); } - private Set concreteEquivalentTypesAlsoIndirectly( - Set considered, InferenceVariableType inferenceVariableType) { + private Set concreteEquivalentTypesAlsoIndirectly(Set considered, InferenceVariableType inferenceVariableType) { considered.add(inferenceVariableType); Set result = new HashSet<>(); - result.addAll(inferenceVariableType.equivalentTypes.stream() - .filter(t -> !t.isTypeVariable() && !(t instanceof InferenceVariableType)) - .collect(Collectors.toSet())); - inferenceVariableType.equivalentTypes.stream() - .filter(t -> t instanceof InferenceVariableType) - .forEach(t -> { - InferenceVariableType ivt = (InferenceVariableType) t; - if (!considered.contains(ivt)) { - result.addAll(concreteEquivalentTypesAlsoIndirectly(considered, ivt)); - } - }); + result.addAll(inferenceVariableType.equivalentTypes.stream().filter(t -> !t.isTypeVariable() && !(t instanceof InferenceVariableType)).collect(Collectors.toSet())); + inferenceVariableType.equivalentTypes.stream().filter(t -> t instanceof InferenceVariableType).forEach(t -> { + InferenceVariableType ivt = (InferenceVariableType) t; + if (!considered.contains(ivt)) { + result.addAll(concreteEquivalentTypesAlsoIndirectly(considered, ivt)); + } + }); return result; } - public ResolvedType equivalentType() { + public ResolvedType equivalentType() { Set concreteEquivalent = concreteEquivalentTypesAlsoIndirectly(new HashSet<>(), this); if (concreteEquivalent.isEmpty()) { if (correspondingTp == null) { @@ -118,9 +115,7 @@ public ResolvedType equivalentType() { if (concreteEquivalent.size() == 1) { return concreteEquivalent.iterator().next(); } - Set notTypeVariables = equivalentTypes.stream() - .filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t)) - .collect(Collectors.toSet()); + Set notTypeVariables = equivalentTypes.stream().filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t)).collect(Collectors.toSet()); if (notTypeVariables.size() == 1) { return notTypeVariables.iterator().next(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java index d4a3d9d794..20d755a069 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java @@ -25,8 +25,7 @@ import com.github.javaparser.resolution.types.ResolvedType; import java.util.List; -public interface MethodResolutionCapability { +public interface MethodResolutionCapability { - SymbolReference solveMethod( - String name, List argumentsTypes, boolean staticOnly); + SymbolReference solveMethod(String name, List argumentsTypes, boolean staticOnly); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java index 524f85096c..135e047569 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java @@ -36,12 +36,11 @@ /** * @author Federico Tomassetti */ -public class MethodResolutionLogic { +public class MethodResolutionLogic { private static String JAVA_LANG_OBJECT = Object.class.getCanonicalName(); - private static List groupVariadicParamValues( - List argumentsTypes, int startVariadic, ResolvedType variadicType) { + private static List groupVariadicParamValues(List argumentsTypes, int startVariadic, ResolvedType variadicType) { List res = new ArrayList<>(argumentsTypes.subList(0, startVariadic)); List variadicValues = argumentsTypes.subList(startVariadic, argumentsTypes.size()); if (variadicValues.isEmpty()) { @@ -62,8 +61,7 @@ private static ResolvedType findCommonType(List variadicValues) { return variadicValues.get(0); } - public static boolean isApplicable( - ResolvedMethodDeclaration method, String name, List argumentsTypes, TypeSolver typeSolver) { + public static boolean isApplicable(ResolvedMethodDeclaration method, String name, List argumentsTypes, TypeSolver typeSolver) { return isApplicable(method, name, argumentsTypes, typeSolver, false); } @@ -76,12 +74,7 @@ public static boolean isApplicable( * * @see {@link MethodResolutionLogic#isApplicable(MethodUsage, String, List, TypeSolver)} */ - private static boolean isApplicable( - ResolvedMethodDeclaration methodDeclaration, - String needleName, - List needleArgumentTypes, - TypeSolver typeSolver, - boolean withWildcardTolerance) { + private static boolean isApplicable(ResolvedMethodDeclaration methodDeclaration, String needleName, List needleArgumentTypes, TypeSolver typeSolver, boolean withWildcardTolerance) { if (!methodDeclaration.getName().equals(needleName)) { return false; } @@ -90,8 +83,7 @@ private static boolean isApplicable( // The index of the final argument passed (on the method usage). int countOfNeedleArgumentsPassed = needleArgumentTypes.size(); boolean methodIsDeclaredWithVariadicParameter = methodDeclaration.hasVariadicParameter(); - if (!methodIsDeclaredWithVariadicParameter - && (countOfNeedleArgumentsPassed != countOfMethodParametersDeclared)) { + if (!methodIsDeclaredWithVariadicParameter && (countOfNeedleArgumentsPassed != countOfMethodParametersDeclared)) { // If it is not variadic, and the number of parameters/arguments are unequal -- this is not a match. return false; } @@ -105,8 +97,7 @@ private static boolean isApplicable( // If the method declaration we're considering has a variadic parameter, // attempt to convert the given list of arguments to fit this pattern // e.g. foo(String s, String... s2) {} --- consider the first argument, then group the remainder as an array - ResolvedType expectedVariadicParameterType = - methodDeclaration.getLastParam().getType(); + ResolvedType expectedVariadicParameterType = methodDeclaration.getLastParam().getType(); for (ResolvedTypeParameterDeclaration tp : methodDeclaration.getTypeParameters()) { expectedVariadicParameterType = replaceTypeParam(expectedVariadicParameterType, tp, typeSolver); } @@ -115,14 +106,9 @@ private static boolean isApplicable( // array. // Confirm all of these grouped "trailing" arguments have the required type -- if not, this is not a // valid type. (Maybe this is also done later..?) - for (int variadicArgumentIndex = countOfMethodParametersDeclared; - variadicArgumentIndex < countOfNeedleArgumentsPassed; - variadicArgumentIndex++) { + for (int variadicArgumentIndex = countOfMethodParametersDeclared; variadicArgumentIndex < countOfNeedleArgumentsPassed; variadicArgumentIndex++) { ResolvedType currentArgumentType = needleArgumentTypes.get(variadicArgumentIndex); - boolean argumentIsAssignableToVariadicComponentType = expectedVariadicParameterType - .asArrayType() - .getComponentType() - .isAssignableBy(currentArgumentType); + boolean argumentIsAssignableToVariadicComponentType = expectedVariadicParameterType.asArrayType().getComponentType().isAssignableBy(currentArgumentType); if (!argumentIsAssignableToVariadicComponentType) { // If any of the arguments are not assignable to the expected variadic type, this is not a // match. @@ -130,8 +116,7 @@ private static boolean isApplicable( } } } - needleArgumentTypes = groupTrailingArgumentsIntoArray( - methodDeclaration, needleArgumentTypes, expectedVariadicParameterType); + needleArgumentTypes = groupTrailingArgumentsIntoArray(methodDeclaration, needleArgumentTypes, expectedVariadicParameterType); } // The index of the final argument passed (on the method usage). int countOfNeedleArgumentsPassedAfterGrouping = needleArgumentTypes.size(); @@ -145,8 +130,7 @@ private static boolean isApplicable( for (int i = 0; i < countOfMethodParametersDeclared; i++) { ResolvedType expectedDeclaredType = methodDeclaration.getParam(i).getType(); ResolvedType actualArgumentType = needleArgumentTypes.get(i); - if ((expectedDeclaredType.isTypeVariable() && !(expectedDeclaredType.isWildcard())) - && expectedDeclaredType.asTypeParameter().declaredOnMethod()) { + if ((expectedDeclaredType.isTypeVariable() && !(expectedDeclaredType.isWildcard())) && expectedDeclaredType.asTypeParameter().declaredOnMethod()) { matchedParameters.put(expectedDeclaredType.asTypeParameter().getName(), actualArgumentType); continue; } @@ -156,22 +140,12 @@ private static boolean isApplicable( // The method call expression String.format("%d", new int[] {1}) // must refer to the method String.format(String, Object...) // even if an array of primitive type cannot be assigned to an array of Object - if (methodDeclaration.getParam(i).isVariadic() - && (i == countOfMethodParametersDeclared - 1) - && isArrayOfObject(expectedDeclaredType) - && actualArgumentType.isArray()) { + if (methodDeclaration.getParam(i).isVariadic() && (i == countOfMethodParametersDeclared - 1) && isArrayOfObject(expectedDeclaredType) && actualArgumentType.isArray()) { continue; } - boolean isAssignableWithoutSubstitution = expectedDeclaredType.isAssignableBy(actualArgumentType) - || (methodDeclaration.getParam(i).isVariadic() - && convertToVariadicParameter(expectedDeclaredType).isAssignableBy(actualArgumentType)); - if (!isAssignableWithoutSubstitution - && expectedDeclaredType.isReferenceType() - && actualArgumentType.isReferenceType()) { - isAssignableWithoutSubstitution = isAssignableMatchTypeParameters( - expectedDeclaredType.asReferenceType(), - actualArgumentType.asReferenceType(), - matchedParameters); + boolean isAssignableWithoutSubstitution = expectedDeclaredType.isAssignableBy(actualArgumentType) || (methodDeclaration.getParam(i).isVariadic() && convertToVariadicParameter(expectedDeclaredType).isAssignableBy(actualArgumentType)); + if (!isAssignableWithoutSubstitution && expectedDeclaredType.isReferenceType() && actualArgumentType.isReferenceType()) { + isAssignableWithoutSubstitution = isAssignableMatchTypeParameters(expectedDeclaredType.asReferenceType(), actualArgumentType.asReferenceType(), matchedParameters); } if (!isAssignableWithoutSubstitution) { List typeParameters = methodDeclaration.getTypeParameters(); @@ -180,9 +154,7 @@ && isArrayOfObject(expectedDeclaredType) expectedDeclaredType = replaceTypeParam(expectedDeclaredType, tp, typeSolver); } if (!expectedDeclaredType.isAssignableBy(actualArgumentType)) { - if (actualArgumentType.isWildcard() - && withWildcardTolerance - && !expectedDeclaredType.isPrimitive()) { + if (actualArgumentType.isWildcard() && withWildcardTolerance && !expectedDeclaredType.isPrimitive()) { needForWildCardTolerance = true; continue; } @@ -191,9 +163,7 @@ && isArrayOfObject(expectedDeclaredType) // for example LambdaConstraintType{bound=TypeVariable {ReflectionTypeParameter{typeVariable=T}}}, // LambdaConstraintType{bound=TypeVariable {ReflectionTypeParameter{typeVariable=U}}} // we want to keep this method for future resolution - if (actualArgumentType.isConstraint() - && withWildcardTolerance - && expectedDeclaredType.isPrimitive()) { + if (actualArgumentType.isConstraint() && withWildcardTolerance && expectedDeclaredType.isPrimitive()) { needForWildCardTolerance = true; continue; } @@ -210,9 +180,7 @@ && isArrayOfObject(expectedDeclaredType) } private static boolean isArrayOfObject(ResolvedType type) { - return type.isArray() - && type.asArrayType().getComponentType().isReferenceType() - && type.asArrayType().getComponentType().asReferenceType().isJavaLangObject(); + return type.isArray() && type.asArrayType().getComponentType().isReferenceType() && type.asArrayType().getComponentType().asReferenceType().isJavaLangObject(); } private static ResolvedArrayType convertToVariadicParameter(ResolvedType type) { @@ -226,10 +194,7 @@ private static int getLastParameterIndex(int countOfMethodParametersDeclared) { return Math.max(0, countOfMethodParametersDeclared - 1); } - private static List groupTrailingArgumentsIntoArray( - ResolvedMethodDeclaration methodDeclaration, - List needleArgumentTypes, - ResolvedType expectedVariadicParameterType) { + private static List groupTrailingArgumentsIntoArray(ResolvedMethodDeclaration methodDeclaration, List needleArgumentTypes, ResolvedType expectedVariadicParameterType) { // The index of the final method parameter (on the method declaration). int countOfMethodParametersDeclared = methodDeclaration.getNumberOfParams(); int lastMethodParameterIndex = getLastParameterIndex(countOfMethodParametersDeclared); @@ -239,25 +204,17 @@ private static List groupTrailingArgumentsIntoArray( if (countOfNeedleArgumentsPassed > countOfMethodParametersDeclared) { // If it is variadic, and we have an "excess" of arguments, group the "trailing" arguments into an array. // Here we are sure that all of these grouped "trailing" arguments have the required type - needleArgumentTypes = groupVariadicParamValues( - needleArgumentTypes, - lastMethodParameterIndex, - methodDeclaration.getLastParam().getType()); + needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType()); } if (countOfNeedleArgumentsPassed == (countOfMethodParametersDeclared - 1)) { // If it is variadic and we are short of **exactly one** parameter, this is a match. // Note that omitting the variadic parameter is treated as an empty array // (thus being short of only 1 argument is fine, but being short of 2 or more is not). // thus group the "empty" value into an empty array... - needleArgumentTypes = groupVariadicParamValues( - needleArgumentTypes, - lastMethodParameterIndex, - methodDeclaration.getLastParam().getType()); + needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType()); } else if (countOfNeedleArgumentsPassed == countOfMethodParametersDeclared) { ResolvedType actualArgumentType = needleArgumentTypes.get(lastNeedleArgumentIndex); - boolean finalArgumentIsArray = actualArgumentType.isArray() - && expectedVariadicParameterType.isAssignableBy( - actualArgumentType.asArrayType().getComponentType()); + boolean finalArgumentIsArray = actualArgumentType.isArray() && expectedVariadicParameterType.isAssignableBy(actualArgumentType.asArrayType().getComponentType()); if (finalArgumentIsArray) { // Treat as an array of values -- in which case the expected parameter type is the common type of this // array. @@ -266,10 +223,7 @@ private static List groupTrailingArgumentsIntoArray( } else { // Treat as a single value -- in which case, the expected parameter type is the same as the single // value. - needleArgumentTypes = groupVariadicParamValues( - needleArgumentTypes, - lastMethodParameterIndex, - methodDeclaration.getLastParam().getType()); + needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType()); } } else { // Should be unreachable. @@ -277,17 +231,12 @@ private static List groupTrailingArgumentsIntoArray( return needleArgumentTypes; } - public static boolean isAssignableMatchTypeParameters( - ResolvedType expected, ResolvedType actual, Map matchedParameters) { + public static boolean isAssignableMatchTypeParameters(ResolvedType expected, ResolvedType actual, Map matchedParameters) { if (expected.isReferenceType() && actual.isReferenceType()) { - return isAssignableMatchTypeParameters( - expected.asReferenceType(), actual.asReferenceType(), matchedParameters); + return isAssignableMatchTypeParameters(expected.asReferenceType(), actual.asReferenceType(), matchedParameters); } if (expected.isReferenceType() && ResolvedPrimitiveType.isBoxType(expected) && actual.isPrimitive()) { - ResolvedPrimitiveType expectedType = ResolvedPrimitiveType.byBoxTypeQName( - expected.asReferenceType().getQualifiedName()) - .get() - .asPrimitive(); + ResolvedPrimitiveType expectedType = ResolvedPrimitiveType.byBoxTypeQName(expected.asReferenceType().getQualifiedName()).get().asPrimitive(); return expected.isAssignableBy(actual); } if (expected.isTypeVariable()) { @@ -298,12 +247,10 @@ public static boolean isAssignableMatchTypeParameters( matchedParameters.put(expected.asArrayType().getComponentType().toString(), actual); return true; } - throw new UnsupportedOperationException( - expected.getClass().getCanonicalName() + " " + actual.getClass().getCanonicalName()); + throw new UnsupportedOperationException(expected.getClass().getCanonicalName() + " " + actual.getClass().getCanonicalName()); } - public static boolean isAssignableMatchTypeParameters( - ResolvedReferenceType expected, ResolvedReferenceType actual, Map matchedParameters) { + public static boolean isAssignableMatchTypeParameters(ResolvedReferenceType expected, ResolvedReferenceType actual, Map matchedParameters) { if (actual.getQualifiedName().equals(expected.getQualifiedName())) { return isAssignableMatchTypeParametersMatchingQName(expected, actual, matchedParameters); } else { @@ -317,13 +264,11 @@ public static boolean isAssignableMatchTypeParameters( return false; } - private static boolean isAssignableMatchTypeParametersMatchingQName( - ResolvedReferenceType expected, ResolvedReferenceType actual, Map matchedParameters) { + private static boolean isAssignableMatchTypeParametersMatchingQName(ResolvedReferenceType expected, ResolvedReferenceType actual, Map matchedParameters) { if (!expected.getQualifiedName().equals(actual.getQualifiedName())) { return false; } - if (expected.typeParametersValues().size() - != actual.typeParametersValues().size()) { + if (expected.typeParametersValues().size() != actual.typeParametersValues().size()) { throw new UnsupportedOperationException(); // return true; } @@ -347,8 +292,7 @@ private static boolean isAssignableMatchTypeParametersMatchingQName( } if (expectedParam.isTypeVariable()) { String expectedParamName = expectedParam.asTypeParameter().getName(); - if (!actualParam.isTypeVariable() - || !actualParam.asTypeParameter().getName().equals(expectedParamName)) { + if (!actualParam.isTypeVariable() || !actualParam.asTypeParameter().getName().equals(expectedParamName)) { return matchTypeVariable(expectedParam.asTypeVariable(), actualParam, matchedParameters); } // actualParam is a TypeVariable and actualParam has the same name as expectedParamName @@ -369,13 +313,9 @@ private static boolean isAssignableMatchTypeParametersMatchingQName( return true; } if (actualParam.isTypeVariable()) { - return matchTypeVariable( - actualParam.asTypeVariable(), - expectedParam.asWildcard().getBoundedType(), - matchedParameters); + return matchTypeVariable(actualParam.asTypeVariable(), expectedParam.asWildcard().getBoundedType(), matchedParameters); } - return isAssignableMatchTypeParameters( - expectedParam.asWildcard().getBoundedType(), actualParam, matchedParameters); + return isAssignableMatchTypeParameters(expectedParam.asWildcard().getBoundedType(), actualParam, matchedParameters); } // TODO verify super bound return true; @@ -385,8 +325,7 @@ private static boolean isAssignableMatchTypeParametersMatchingQName( return true; } - private static boolean matchTypeVariable( - ResolvedTypeVariable typeVariable, ResolvedType type, Map matchedParameters) { + private static boolean matchTypeVariable(ResolvedTypeVariable typeVariable, ResolvedType type, Map matchedParameters) { String typeParameterName = typeVariable.asTypeParameter().getName(); if (matchedParameters.containsKey(typeParameterName)) { ResolvedType matchedParameter = matchedParameters.get(typeParameterName); @@ -405,8 +344,7 @@ private static boolean matchTypeVariable( return true; } - public static ResolvedType replaceTypeParam( - ResolvedType type, ResolvedTypeParameterDeclaration tp, TypeSolver typeSolver) { + public static ResolvedType replaceTypeParam(ResolvedType type, ResolvedTypeParameterDeclaration tp, TypeSolver typeSolver) { if (type.isTypeVariable() || type.isWildcard()) { if (type.describe().equals(tp.getName())) { List bounds = tp.getBounds(); @@ -428,12 +366,10 @@ public static ResolvedType replaceTypeParam( } if (type.isReferenceType()) { ResolvedReferenceType result = type.asReferenceType(); - result = result.transformTypeParameters(typeParam -> replaceTypeParam(typeParam, tp, typeSolver)) - .asReferenceType(); + result = result.transformTypeParameters(typeParam -> replaceTypeParam(typeParam, tp, typeSolver)).asReferenceType(); return result; } - throw new UnsupportedOperationException("Replacing " + type + ", param " + tp + " with " - + type.getClass().getCanonicalName()); + throw new UnsupportedOperationException("Replacing " + type + ", param " + tp + " with " + type.getClass().getCanonicalName()); } /** @@ -446,11 +382,7 @@ public static ResolvedType replaceTypeParam( * @see {@link MethodResolutionLogic#isApplicable(ResolvedMethodDeclaration, String, List, TypeSolver)} } * @see {@link MethodResolutionLogic#isApplicable(ResolvedMethodDeclaration, String, List, TypeSolver, boolean)} */ - public static boolean isApplicable( - MethodUsage methodUsage, - String needleName, - List needleParameterTypes, - TypeSolver typeSolver) { + public static boolean isApplicable(MethodUsage methodUsage, String needleName, List needleParameterTypes, TypeSolver typeSolver) { if (!methodUsage.getName().equals(needleName)) { return false; } @@ -460,8 +392,7 @@ public static boolean isApplicable( // The index of the final argument passed (on the method usage). int needleParameterCount = needleParameterTypes.size(); // TODO: Does the method usage have a declaration at this point..? - boolean methodIsDeclaredWithVariadicParameter = - methodUsage.getDeclaration().hasVariadicParameter(); + boolean methodIsDeclaredWithVariadicParameter = methodUsage.getDeclaration().hasVariadicParameter(); // If the counts do not match and the method is not variadic, this is not a match. if (!methodIsDeclaredWithVariadicParameter && !(needleParameterCount == countOfMethodUsageArgumentsPassed)) { return false; @@ -470,8 +401,7 @@ public static boolean isApplicable( // parameters // allow you to omit the vararg, which would allow a difference of one, but a difference in count of 2 or more // is not a match. - if (!(needleParameterCount == countOfMethodUsageArgumentsPassed) - && needleParameterCount < lastMethodUsageArgumentIndex) { + if (!(needleParameterCount == countOfMethodUsageArgumentsPassed) && needleParameterCount < lastMethodUsageArgumentIndex) { return false; } // Iterate over the arguments given to the method, and compare their types against the given method's declared @@ -493,8 +423,7 @@ public static boolean isApplicable( // assignable by stringArray} // Example: {@code void test(String[]... s) {}} and {@code test(stringArrayArray)} -- {@code String[]... // is assignable by stringArrayArray} - boolean argumentIsArray = (needleParameterCount == countOfMethodUsageArgumentsPassed) - && expectedArgumentType.isAssignableBy(actualArgumentType); + boolean argumentIsArray = (needleParameterCount == countOfMethodUsageArgumentsPassed) && expectedArgumentType.isAssignableBy(actualArgumentType); if (!argumentIsArray) { // Get the component type of the declared parameter type. expectedArgumentType = expectedArgumentType.asArrayType().getComponentType(); @@ -502,16 +431,14 @@ public static boolean isApplicable( } // Consider type parameters directly on the method declaration, and ALSO on the enclosing type (e.g. a // class) - List typeParameters = - methodUsage.getDeclaration().getTypeParameters(); + List typeParameters = methodUsage.getDeclaration().getTypeParameters(); typeParameters.addAll(methodUsage.declaringType().getTypeParameters()); ResolvedType expectedTypeWithoutSubstitutions = expectedArgumentType; ResolvedType expectedTypeWithInference = expectedArgumentType; Map derivedValues = new HashMap<>(); // For each declared parameter, infer the types that will replace generics (type parameters) for (int j = 0; j < countOfMethodUsageArgumentsPassed; j++) { - ResolvedParameterDeclaration parameter = - methodUsage.getDeclaration().getParam(j); + ResolvedParameterDeclaration parameter = methodUsage.getDeclaration().getParam(j); ResolvedType parameterType = parameter.getType(); if (parameter.isVariadic()) { // Don't continue if a vararg parameter is reached and there are no arguments left @@ -531,23 +458,17 @@ public static boolean isApplicable( if (tp.getBounds().isEmpty()) { // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(), new // ReferenceTypeUsageImpl(typeSolver.solveType(JAVA_LANG_OBJECT), typeSolver)); - expectedArgumentType = expectedArgumentType.replaceTypeVariables( - tp, - ResolvedWildcard.extendsBound( - new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)))); + expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.extendsBound(new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)))); } else if (tp.getBounds().size() == 1) { - ResolvedTypeParameterDeclaration.Bound bound = - tp.getBounds().get(0); + ResolvedTypeParameterDeclaration.Bound bound = tp.getBounds().get(0); if (bound.isExtends()) { // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(), // bound.getType()); - expectedArgumentType = expectedArgumentType.replaceTypeVariables( - tp, ResolvedWildcard.extendsBound(bound.getType())); + expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.extendsBound(bound.getType())); } else { // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(), new // ReferenceTypeUsageImpl(typeSolver.solveType(JAVA_LANG_OBJECT), typeSolver)); - expectedArgumentType = expectedArgumentType.replaceTypeVariables( - tp, ResolvedWildcard.superBound(bound.getType())); + expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.superBound(bound.getType())); } } else { throw new UnsupportedOperationException(); @@ -557,17 +478,13 @@ public static boolean isApplicable( ResolvedType expectedTypeWithSubstitutions = expectedTypeWithoutSubstitutions; for (ResolvedTypeParameterDeclaration tp : typeParameters) { if (tp.getBounds().isEmpty()) { - expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables( - tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))); + expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))); } else if (tp.getBounds().size() == 1) { - ResolvedTypeParameterDeclaration.Bound bound = - tp.getBounds().get(0); + ResolvedTypeParameterDeclaration.Bound bound = tp.getBounds().get(0); if (bound.isExtends()) { - expectedTypeWithSubstitutions = - expectedTypeWithSubstitutions.replaceTypeVariables(tp, bound.getType()); + expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, bound.getType()); } else { - expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables( - tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))); + expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))); } } else { throw new UnsupportedOperationException(); @@ -575,10 +492,7 @@ public static boolean isApplicable( } // If the given argument still isn't applicable even after considering type arguments/generics, this is not // a match. - if (!expectedArgumentType.isAssignableBy(actualArgumentType) - && !expectedTypeWithSubstitutions.isAssignableBy(actualArgumentType) - && !expectedTypeWithInference.isAssignableBy(actualArgumentType) - && !expectedTypeWithoutSubstitutions.isAssignableBy(actualArgumentType)) { + if (!expectedArgumentType.isAssignableBy(actualArgumentType) && !expectedTypeWithSubstitutions.isAssignableBy(actualArgumentType) && !expectedTypeWithInference.isAssignableBy(actualArgumentType) && !expectedTypeWithoutSubstitutions.isAssignableBy(actualArgumentType)) { return false; } } @@ -603,33 +517,19 @@ private static Predicate distinctByKey(Function keyExtracto /** * @param methods we expect the methods to be ordered such that inherited methods are later in the list */ - public static SymbolReference findMostApplicable( - List methods, - String name, - List argumentsTypes, - TypeSolver typeSolver) { - SymbolReference res = - findMostApplicable(methods, name, argumentsTypes, typeSolver, false); + public static SymbolReference findMostApplicable(List methods, String name, List argumentsTypes, TypeSolver typeSolver) { + SymbolReference res = findMostApplicable(methods, name, argumentsTypes, typeSolver, false); if (res.isSolved()) { return res; } return findMostApplicable(methods, name, argumentsTypes, typeSolver, true); } - public static SymbolReference findMostApplicable( - List methods, - String name, - List argumentsTypes, - TypeSolver typeSolver, - boolean wildcardTolerance) { - List applicableMethods = methods.stream() - . // Only consider methods with a matching name - filter(m -> m.getName().equals(name)) - . // Filters out duplicate ResolvedMethodDeclaration by their signature. - filter(distinctByKey(ResolvedMethodDeclaration::getQualifiedSignature)) - . // Checks if ResolvedMethodDeclaration is applicable to argumentsTypes. - filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver, wildcardTolerance)) - .collect(Collectors.toList()); + public static SymbolReference findMostApplicable(List methods, String name, List argumentsTypes, TypeSolver typeSolver, boolean wildcardTolerance) { + List applicableMethods = methods.stream().// Only consider methods with a matching name + filter(m -> m.getName().equals(name)).// Filters out duplicate ResolvedMethodDeclaration by their signature. + filter(distinctByKey(ResolvedMethodDeclaration::getQualifiedSignature)).// Checks if ResolvedMethodDeclaration is applicable to argumentsTypes. + filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver, wildcardTolerance)).collect(Collectors.toList()); // If no applicable methods found, return as unsolved. if (applicableMethods.isEmpty()) { return SymbolReference.unsolved(); @@ -687,10 +587,7 @@ public static SymbolReference findMostApplicable( winningCandidate = other; } else if (!winningCandidate.isGeneric() && other.isGeneric()) { // nothing to do at this stage winningCandidate is the winner - } else if (winningCandidate - .declaringType() - .getQualifiedName() - .equals(other.declaringType().getQualifiedName())) { + } else if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) { possibleAmbiguity = true; } else { // we expect the methods to be ordered such that inherited methods are later in the list @@ -703,8 +600,7 @@ public static SymbolReference findMostApplicable( if (isExactMatch(other, argumentsTypes)) { winningCandidate = other; } else { - throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " - + winningCandidate + ", " + other); + throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other); } } } @@ -731,8 +627,7 @@ private static ResolvedType getMethodsExplicitAndVariadicParameterType(ResolvedM return null; } - private static boolean isMoreSpecific( - ResolvedMethodDeclaration methodA, ResolvedMethodDeclaration methodB, List argumentTypes) { + private static boolean isMoreSpecific(ResolvedMethodDeclaration methodA, ResolvedMethodDeclaration methodB, List argumentTypes) { final boolean aVariadic = methodA.hasVariadicParameter(); final boolean bVariadic = methodB.hasVariadicParameter(); final int aNumberOfParams = methodA.getNumberOfParams(); @@ -744,14 +639,10 @@ private static boolean isMoreSpecific( boolean isMethodAMoreSpecific = false; // If one method declaration has exactly the correct amount of parameters and is not variadic then it is always // preferred to a declaration that is variadic (and hence possibly also has a different amount of parameters). - if (!aVariadic - && aNumberOfParams == numberOfArgs - && (bVariadic && (bNumberOfParams != numberOfArgs || !isLastArgArray))) { + if (!aVariadic && aNumberOfParams == numberOfArgs && (bVariadic && (bNumberOfParams != numberOfArgs || !isLastArgArray))) { return true; } - if (!bVariadic - && bNumberOfParams == numberOfArgs - && (aVariadic && (aNumberOfParams != numberOfArgs || !isLastArgArray))) { + if (!bVariadic && bNumberOfParams == numberOfArgs && (aVariadic && (aNumberOfParams != numberOfArgs || !isLastArgArray))) { return false; } // If both methods are variadic but the calling method omits any varArgs, bump the omitted args to @@ -780,16 +671,10 @@ private static boolean isMoreSpecific( // The method call will call foo(long), as it requires a widening primitive conversion from int to long // instead of a boxing conversion from int to Integer. See JLS §15.12.2. // This is what we check here. - if (argType != null - && paramTypeA.isPrimitive() == argType.isPrimitive() - && paramTypeB.isPrimitive() != argType.isPrimitive() - && paramTypeA.isAssignableBy(argType)) { + if (argType != null && paramTypeA.isPrimitive() == argType.isPrimitive() && paramTypeB.isPrimitive() != argType.isPrimitive() && paramTypeA.isAssignableBy(argType)) { return true; } - if (argType != null - && paramTypeB.isPrimitive() == argType.isPrimitive() - && paramTypeA.isPrimitive() != argType.isPrimitive() - && paramTypeB.isAssignableBy(argType)) { + if (argType != null && paramTypeB.isPrimitive() == argType.isPrimitive() && paramTypeA.isPrimitive() != argType.isPrimitive() && paramTypeB.isAssignableBy(argType)) { return false; // if paramA and paramB are not the last parameters // and the type of paramA or paramB (which are not more specific at this stage) is java.lang.Object @@ -830,19 +715,15 @@ private static boolean isMoreSpecific( } private static boolean isJavaLangObject(ResolvedType paramType) { - return paramType.isReferenceType() - && paramType.asReferenceType().getQualifiedName().equals("java.lang.Object"); + return paramType.isReferenceType() && paramType.asReferenceType().getQualifiedName().equals("java.lang.Object"); } private static boolean isMoreSpecific(MethodUsage methodA, MethodUsage methodB, List argumentTypes) { return isMoreSpecific(methodA.getDeclaration(), methodB.getDeclaration(), argumentTypes); } - public static Optional findMostApplicableUsage( - List methods, String name, List argumentsTypes, TypeSolver typeSolver) { - List applicableMethods = methods.stream() - .filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver)) - .collect(Collectors.toList()); + public static Optional findMostApplicableUsage(List methods, String name, List argumentsTypes, TypeSolver typeSolver) { + List applicableMethods = methods.stream().filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver)).collect(Collectors.toList()); if (applicableMethods.isEmpty()) { return Optional.empty(); } @@ -857,15 +738,9 @@ public static Optional findMostApplicableUsage( } else if (isMoreSpecific(other, winningCandidate, argumentsTypes)) { winningCandidate = other; } else { - if (winningCandidate - .declaringType() - .getQualifiedName() - .equals(other.declaringType().getQualifiedName())) { + if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) { if (!areOverride(winningCandidate, other)) { - throw new MethodAmbiguityException( - "Ambiguous method call: cannot find a most applicable method: " + winningCandidate - + ", " + other + ". First declared in " - + winningCandidate.declaringType().getQualifiedName()); + throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other + ". First declared in " + winningCandidate.declaringType().getQualifiedName()); } } else { // we expect the methods to be ordered such that inherited methods are later in the list @@ -884,35 +759,26 @@ private static boolean areOverride(MethodUsage winningCandidate, MethodUsage oth return false; } for (int i = 0; i < winningCandidate.getNoParams(); i++) { - if (!winningCandidate - .getParamTypes() - .get(i) - .equals(other.getParamTypes().get(i))) { + if (!winningCandidate.getParamTypes().get(i).equals(other.getParamTypes().get(i))) { return false; } } return true; } - public static SymbolReference solveMethodInType( - ResolvedTypeDeclaration typeDeclaration, String name, List argumentsTypes) { + public static SymbolReference solveMethodInType(ResolvedTypeDeclaration typeDeclaration, String name, List argumentsTypes) { return solveMethodInType(typeDeclaration, name, argumentsTypes, false); } // TODO: Replace TypeDeclaration.solveMethod - public static SymbolReference solveMethodInType( - ResolvedTypeDeclaration typeDeclaration, - String name, - List argumentsTypes, - boolean staticOnly) { + public static SymbolReference solveMethodInType(ResolvedTypeDeclaration typeDeclaration, String name, List argumentsTypes, boolean staticOnly) { if (typeDeclaration instanceof MethodResolutionCapability) { return ((MethodResolutionCapability) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly); } throw new UnsupportedOperationException(typeDeclaration.getClass().getCanonicalName()); } - public static void inferTypes( - ResolvedType source, ResolvedType target, Map mappings) { + public static void inferTypes(ResolvedType source, ResolvedType target, Map mappings) { if (source.equals(target)) { return; } @@ -922,10 +788,7 @@ public static void inferTypes( if (sourceRefType.getQualifiedName().equals(targetRefType.getQualifiedName())) { if (!sourceRefType.isRawType() && !targetRefType.isRawType()) { for (int i = 0; i < sourceRefType.typeParametersValues().size(); i++) { - inferTypes( - sourceRefType.typeParametersValues().get(i), - targetRefType.typeParametersValues().get(i), - mappings); + inferTypes(sourceRefType.typeParametersValues().get(i), targetRefType.typeParametersValues().get(i), mappings); } } } @@ -940,10 +803,7 @@ public static void inferTypes( } if (source.isWildcard() && target.isWildcard()) { if (source.asWildcard().isBounded() && target.asWildcard().isBounded()) { - inferTypes( - source.asWildcard().getBoundedType(), - target.asWildcard().getBoundedType(), - mappings); + inferTypes(source.asWildcard().getBoundedType(), target.asWildcard().getBoundedType(), mappings); } return; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java index d19c13488f..fe523d75d9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java @@ -29,42 +29,42 @@ * * @author Federico Tomassetti */ -public class LambdaArgumentTypePlaceholder implements ResolvedType { +public class LambdaArgumentTypePlaceholder implements ResolvedType { private int pos; private SymbolReference method; - public LambdaArgumentTypePlaceholder(int pos) { + public LambdaArgumentTypePlaceholder(int pos) { this.pos = pos; } @Override - public boolean isArray() { + public boolean isArray() { return false; } @Override - public boolean isReferenceType() { + public boolean isReferenceType() { return false; } @Override - public String describe() { + public String describe() { throw new UnsupportedOperationException(); } @Override - public boolean isTypeVariable() { + public boolean isTypeVariable() { return false; } - public void setMethod(SymbolReference method) { + public void setMethod(SymbolReference method) { this.method = method; } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { throw new UnsupportedOperationException(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java index f1197436de..000b136ded 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java @@ -31,7 +31,7 @@ * * @author Federico Tomassetti */ -public class SymbolReference { +public class SymbolReference { /** * Create a solve reference to the given symbol. @@ -72,8 +72,7 @@ public static SymbolReference u * @param The Symbol Reference before adapting. * @param The Symbol Reference after adapting. */ - public static SymbolReference adapt( - SymbolReference ref, Class clazz) { + public static SymbolReference adapt(SymbolReference ref, Class clazz) { Optional declaration = ref.getDeclaration(); if (declaration.isPresent()) { I symbol = declaration.get(); @@ -95,28 +94,26 @@ private SymbolReference(@Nullable S correspondingDeclaration) { * * @return an {@link Optional} with a present value if the symbol is solved, otherwise an empty {@link Optional}. */ - public Optional getDeclaration() { + public Optional getDeclaration() { return Optional.ofNullable(correspondingDeclaration); } /** * The corresponding declaration. If not solve this throws UnsupportedOperationException. */ - public S getCorrespondingDeclaration() { - return getDeclaration() - .orElseThrow(() -> - new UnsolvedSymbolException("Corresponding declaration not available for unsolved symbol.")); + public S getCorrespondingDeclaration() { + return getDeclaration().orElseThrow(() -> new UnsolvedSymbolException("Corresponding declaration not available for unsolved symbol.")); } /** * Is the reference solved? */ - public boolean isSolved() { + public boolean isSolved() { return getDeclaration().isPresent(); } @Override - public String toString() { + public String toString() { return "SymbolReference{" + correspondingDeclaration + "}"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/Value.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/Value.java index 902ac3237e..fb2103febb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/Value.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/Value.java @@ -28,13 +28,13 @@ * * @author Federico Tomassetti */ -public class Value { +public class Value { private ResolvedType type; private String name; - public Value(ResolvedType type, String name) { + public Value(ResolvedType type, String name) { this.type = type; this.name = name; } @@ -48,15 +48,15 @@ public static Value from(ResolvedValueDeclaration decl) { } @Override - public String toString() { + public String toString() { return "Value{" + "type=" + type + ", name='" + name + '\'' + '}'; } - public String getName() { + public String getName() { return name; } - public ResolvedType getType() { + public ResolvedType getType() { return type; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java index 37806651fa..39add72b5d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java @@ -25,17 +25,17 @@ import java.util.Map; import java.util.function.Function; -public class LazyType implements ResolvedType { +public class LazyType implements ResolvedType { private ResolvedType concrete; private Function provider; - public LazyType(Function provider) { + public LazyType(Function provider) { this.provider = provider; } - public ResolvedType getType() { + public ResolvedType getType() { if (concrete == null) { concrete = provider.apply(null); } @@ -43,100 +43,97 @@ public ResolvedType getType() { } @Override - public boolean isArray() { + public boolean isArray() { return getType().isArray(); } @Override - public int arrayLevel() { + public int arrayLevel() { return getType().arrayLevel(); } @Override - public boolean isPrimitive() { + public boolean isPrimitive() { return getType().isPrimitive(); } @Override - public boolean isNull() { + public boolean isNull() { return getType().isNull(); } @Override - public boolean isReference() { + public boolean isReference() { return getType().isReference(); } @Override - public boolean isReferenceType() { + public boolean isReferenceType() { return getType().isReferenceType(); } @Override - public boolean isVoid() { + public boolean isVoid() { return getType().isVoid(); } @Override - public boolean isTypeVariable() { + public boolean isTypeVariable() { return getType().isTypeVariable(); } @Override - public boolean isWildcard() { + public boolean isWildcard() { return getType().isWildcard(); } @Override - public ResolvedArrayType asArrayType() { + public ResolvedArrayType asArrayType() { return getType().asArrayType(); } @Override - public ResolvedReferenceType asReferenceType() { + public ResolvedReferenceType asReferenceType() { return getType().asReferenceType(); } @Override - public ResolvedTypeParameterDeclaration asTypeParameter() { + public ResolvedTypeParameterDeclaration asTypeParameter() { return getType().asTypeParameter(); } @Override - public ResolvedTypeVariable asTypeVariable() { + public ResolvedTypeVariable asTypeVariable() { return getType().asTypeVariable(); } @Override - public ResolvedPrimitiveType asPrimitive() { + public ResolvedPrimitiveType asPrimitive() { return getType().asPrimitive(); } @Override - public ResolvedWildcard asWildcard() { + public ResolvedWildcard asWildcard() { return getType().asWildcard(); } @Override - public String describe() { + public String describe() { return getType().describe(); } @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tp, - ResolvedType replaced, - Map inferredTypes) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map inferredTypes) { return getType().replaceTypeVariables(tp, replaced, inferredTypes); } @Override - public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced) { return getType().replaceTypeVariables(tp, replaced); } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { return getType().isAssignableBy(other); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java index 041458ae59..7b4950c899 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java @@ -27,7 +27,7 @@ * * @author Federico Tomassetti */ -public class NullType implements ResolvedType { +public class NullType implements ResolvedType { public static final NullType INSTANCE = new NullType(); @@ -36,32 +36,31 @@ private NullType() { } @Override - public boolean isArray() { + public boolean isArray() { return false; } - public boolean isNull() { + public boolean isNull() { return true; } @Override - public boolean isReferenceType() { + public boolean isReferenceType() { return false; } @Override - public String describe() { + public String describe() { return "null"; } @Override - public boolean isTypeVariable() { + public boolean isTypeVariable() { return false; } @Override - public boolean isAssignableBy(ResolvedType other) { - throw new UnsupportedOperationException( - "It does not make sense to assign a value to null, it can only be assigned"); + public boolean isAssignableBy(ResolvedType other) { + throw new UnsupportedOperationException("It does not make sense to assign a value to null, it can only be assigned"); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java index 522acdd39d..b90ac28f68 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java @@ -40,23 +40,16 @@ /** * @author Federico Tomassetti */ -public class ReferenceTypeImpl extends ResolvedReferenceType { +public class ReferenceTypeImpl extends ResolvedReferenceType { - private static final String[] ASSIGNABLE_REFERENCE_TYPE = { - "java.lang.Object", "java.lang.Cloneable", "java.io.Serializable" - }; + private static final String[] ASSIGNABLE_REFERENCE_TYPE = { "java.lang.Object", "java.lang.Cloneable", "java.io.Serializable" }; public static ResolvedReferenceType undeterminedParameters(ResolvedReferenceTypeDeclaration typeDeclaration) { - return new ReferenceTypeImpl( - typeDeclaration, - typeDeclaration.getTypeParameters().stream() - .map(ResolvedTypeVariable::new) - .collect(Collectors.toList())); + return new ReferenceTypeImpl(typeDeclaration, typeDeclaration.getTypeParameters().stream().map(ResolvedTypeVariable::new).collect(Collectors.toList())); } @Override - protected ResolvedReferenceType create( - ResolvedReferenceTypeDeclaration typeDeclaration, List typeParametersCorrected) { + protected ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, List typeParametersCorrected) { return new ReferenceTypeImpl(typeDeclaration, typeParametersCorrected); } @@ -65,16 +58,16 @@ protected ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDecl return new ReferenceTypeImpl(typeDeclaration); } - public ReferenceTypeImpl(ResolvedReferenceTypeDeclaration typeDeclaration) { + public ReferenceTypeImpl(ResolvedReferenceTypeDeclaration typeDeclaration) { super(typeDeclaration); } - public ReferenceTypeImpl(ResolvedReferenceTypeDeclaration typeDeclaration, List typeArguments) { + public ReferenceTypeImpl(ResolvedReferenceTypeDeclaration typeDeclaration, List typeArguments) { super(typeDeclaration, typeArguments); } @Override - public ResolvedTypeParameterDeclaration asTypeParameter() { + public ResolvedTypeParameterDeclaration asTypeParameter() { return this.typeDeclaration.asTypeParameter(); } @@ -82,7 +75,7 @@ public ResolvedTypeParameterDeclaration asTypeParameter() { * This method checks if ThisType t = new OtherType() would compile. */ @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { if (other instanceof NullType) { return !this.isPrimitive(); } @@ -96,11 +89,10 @@ public boolean isAssignableBy(ResolvedType other) { return true; } // Check if 'other' can be boxed to match this type - if (isCorrespondingBoxingType(other.describe())) return true; + if (isCorrespondingBoxingType(other.describe())) + return true; // All numeric types extend Number - return other.isNumericType() - && this.isReferenceType() - && this.asReferenceType().getQualifiedName().equals(Number.class.getCanonicalName()); + return other.isNumericType() && this.isReferenceType() && this.asReferenceType().getQualifiedName().equals(Number.class.getCanonicalName()); } if (other instanceof LambdaArgumentTypePlaceholder) { return FunctionalInterfaceLogic.isFunctionalInterfaceType(this); @@ -118,8 +110,7 @@ public boolean isAssignableBy(ResolvedType other) { return false; } if (other.isTypeVariable()) { - for (ResolvedTypeParameterDeclaration.Bound bound : - other.asTypeVariable().asTypeParameter().getBounds()) { + for (ResolvedTypeParameterDeclaration.Bound bound : other.asTypeVariable().asTypeParameter().getBounds()) { if (bound.isExtends()) { if (this.isAssignableBy(bound.getType())) { return true; @@ -157,7 +148,7 @@ private boolean isAssignableByReferenceType(String qname) { } @Override - public Set getDeclaredMethods() { + public Set getDeclaredMethods() { // TODO replace variables Set methods = new HashSet<>(); getTypeDeclaration().ifPresent(referenceTypeDeclaration -> { @@ -170,7 +161,7 @@ public Set getDeclaredMethods() { } @Override - public ResolvedType toRawType() { + public ResolvedType toRawType() { if (this.isRawType()) { return this; } @@ -178,7 +169,7 @@ public ResolvedType toRawType() { } @Override - public boolean mention(List typeParameters) { + public boolean mention(List typeParameters) { return typeParametersValues().stream().anyMatch(tp -> tp.mention(typeParameters)); } @@ -186,15 +177,14 @@ public boolean mention(List typeParameters) { * Execute a transformation on all the type parameters of this element. */ @Override - public ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer) { + public ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer) { ResolvedType result = this; int i = 0; for (ResolvedType tp : this.typeParametersValues()) { ResolvedType transformedTp = transformer.transform(tp); // Identity comparison on purpose if (transformedTp != tp) { - List typeParametersCorrected = - result.asReferenceType().typeParametersValues(); + List typeParametersCorrected = result.asReferenceType().typeParametersValues(); typeParametersCorrected.set(i, transformedTp); result = create(typeDeclaration, typeParametersCorrected); } @@ -207,38 +197,30 @@ public ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer) * Get all ancestors with the default traverser (depth first) */ @Override - public List getAllAncestors() { + public List getAllAncestors() { return getAllAncestors(ResolvedReferenceTypeDeclaration.depthFirstFunc); } @Override - public List getAllAncestors( - Function> traverser) { + public List getAllAncestors(Function> traverser) { // We need to go through the inheritance line and propagate the type parameters List ancestors = typeDeclaration.getAllAncestors(traverser); - ancestors = ancestors.stream() - .map(a -> typeParametersMap().replaceAll(a).asReferenceType()) - .collect(Collectors.toList()); + ancestors = ancestors.stream().map(a -> typeParametersMap().replaceAll(a).asReferenceType()).collect(Collectors.toList()); return ancestors; } @Override - public List getDirectAncestors() { + public List getDirectAncestors() { // We need to go through the inheritance line and propagate the type parameters List ancestors = typeDeclaration.getAncestors(); - ancestors = ancestors.stream() - .map(a -> typeParametersMap().replaceAll(a).asReferenceType()) - .collect(Collectors.toList()); + ancestors = ancestors.stream().map(a -> typeParametersMap().replaceAll(a).asReferenceType()).collect(Collectors.toList()); // Conditionally re-insert java.lang.Object as an ancestor. if (this.getTypeDeclaration().isPresent()) { - ResolvedReferenceTypeDeclaration thisTypeDeclaration = - this.getTypeDeclaration().get(); + ResolvedReferenceTypeDeclaration thisTypeDeclaration = this.getTypeDeclaration().get(); // The superclass of interfaces is always null if (thisTypeDeclaration.isClass()) { - Optional optionalSuperClass = - thisTypeDeclaration.asClass().getSuperClass(); - boolean superClassIsJavaLangObject = optionalSuperClass.isPresent() - && optionalSuperClass.get().isJavaLangObject(); + Optional optionalSuperClass = thisTypeDeclaration.asClass().getSuperClass(); + boolean superClassIsJavaLangObject = optionalSuperClass.isPresent() && optionalSuperClass.get().isJavaLangObject(); boolean thisIsJavaLangObject = thisTypeDeclaration.asClass().isJavaLangObject(); if (superClassIsJavaLangObject && !thisIsJavaLangObject) { ancestors.add(optionalSuperClass.get()); @@ -249,12 +231,12 @@ public List getDirectAncestors() { } @Override - public ResolvedReferenceType deriveTypeParameters(ResolvedTypeParametersMap typeParametersMap) { + public ResolvedReferenceType deriveTypeParameters(ResolvedTypeParametersMap typeParametersMap) { return create(typeDeclaration, typeParametersMap); } @Override - public Set getDeclaredFields() { + public Set getDeclaredFields() { Set allFields = new LinkedHashSet<>(); if (getTypeDeclaration().isPresent()) { allFields.addAll(getTypeDeclaration().get().getDeclaredFields()); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/promotion/ConditionalExprHandler.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/promotion/ConditionalExprHandler.java index ce3293cec5..868dd06bc4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/promotion/ConditionalExprHandler.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/promotion/ConditionalExprHandler.java @@ -21,7 +21,7 @@ import com.github.javaparser.resolution.types.ResolvedType; -public interface ConditionalExprHandler { +public interface ConditionalExprHandler { ResolvedType resolveType(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java index c656d806a0..4bdf375b22 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java @@ -28,11 +28,11 @@ * * @author Federico Tomassetti */ -public class ResolvedArrayType implements ResolvedType { +public class ResolvedArrayType implements ResolvedType { private ResolvedType baseType; - public ResolvedArrayType(ResolvedType baseType) { + public ResolvedArrayType(ResolvedType baseType) { this.baseType = baseType; } @@ -40,21 +40,24 @@ public ResolvedArrayType(ResolvedType baseType) { // / Object methods // / @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; ResolvedArrayType that = (ResolvedArrayType) o; - if (!baseType.equals(that.baseType)) return false; + if (!baseType.equals(that.baseType)) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { return baseType.hashCode(); } @Override - public String toString() { + public String toString() { return "ResolvedArrayType{" + baseType + "}"; } @@ -62,26 +65,26 @@ public String toString() { // / Type methods // / @Override - public ResolvedArrayType asArrayType() { + public ResolvedArrayType asArrayType() { return this; } @Override - public boolean isArray() { + public boolean isArray() { return true; } @Override - public String describe() { + public String describe() { return baseType.describe() + "[]"; } - public ResolvedType getComponentType() { + public ResolvedType getComponentType() { return baseType; } @Override - public // https://docs.oracle.com/javase/specs/jls/se8/html/jls-5.html#jls-5.2 + public // https://docs.oracle.com/javase/specs/jls/se8/html/jls-5.html#jls-5.2 boolean isAssignableBy(ResolvedType other) { if (other.isNull()) { return true; @@ -92,10 +95,7 @@ boolean isAssignableBy(ResolvedType other) { } // An array of primitive type is not assignable by an array of boxed type nor the reverse // An array of primitive type cannot be assigned to an array of Object - if ((baseType.isPrimitive() - && other.asArrayType().getComponentType().isReferenceType()) - || (baseType.isReferenceType() - && other.asArrayType().getComponentType().isPrimitive())) { + if ((baseType.isPrimitive() && other.asArrayType().getComponentType().isReferenceType()) || (baseType.isReferenceType() && other.asArrayType().getComponentType().isPrimitive())) { return false; } // An array can be assigned only to a variable of a compatible array type, or to @@ -106,10 +106,7 @@ boolean isAssignableBy(ResolvedType other) { } @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tpToReplace, - ResolvedType replaced, - Map inferredTypes) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map inferredTypes) { ResolvedType baseTypeReplaced = baseType.replaceTypeVariables(tpToReplace, replaced, inferredTypes); if (baseTypeReplaced == baseType) { return this; @@ -122,12 +119,12 @@ public ResolvedType replaceTypeVariables( // / // The erasure of an array type T[] is |T|[]. @Override - public ResolvedType erasure() { + public ResolvedType erasure() { return new ResolvedArrayType(baseType.erasure()); } @Override - public String toDescriptor() { + public String toDescriptor() { StringBuffer sb = new StringBuffer(); sb.append("["); sb.append(baseType.toDescriptor()); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java index 6c523ee63b..f715ca4462 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java @@ -29,49 +29,45 @@ * * @author Federico Tomassetti */ -public class ResolvedIntersectionType implements ResolvedType { +public class ResolvedIntersectionType implements ResolvedType { private List elements; - public ResolvedIntersectionType(Collection elements) { + public ResolvedIntersectionType(Collection elements) { if (elements.size() < 2) { - throw new IllegalArgumentException( - "An intersection type should have at least two elements. This has " + elements.size()); + throw new IllegalArgumentException("An intersection type should have at least two elements. This has " + elements.size()); } this.elements = new LinkedList<>(elements); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; ResolvedIntersectionType that = (ResolvedIntersectionType) o; return new HashSet<>(elements).equals(new HashSet<>(that.elements)); } @Override - public int hashCode() { + public int hashCode() { return new HashSet<>(elements).hashCode(); } @Override - public String describe() { + public String describe() { return String.join(" & ", elements.stream().map(ResolvedType::describe).collect(Collectors.toList())); } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { return elements.stream().allMatch(e -> e.isAssignableBy(other)); } @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tp, - ResolvedType replaced, - Map inferredTypes) { - List elementsReplaced = elements.stream() - .map(e -> e.replaceTypeVariables(tp, replaced, inferredTypes)) - .collect(Collectors.toList()); + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map inferredTypes) { + List elementsReplaced = elements.stream().map(e -> e.replaceTypeVariables(tp, replaced, inferredTypes)).collect(Collectors.toList()); if (elementsReplaced.equals(elements)) { return this; } @@ -81,7 +77,7 @@ public ResolvedType replaceTypeVariables( /* * Returns the list of the resolved types */ - public List getElements() { + public List getElements() { return elements; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedLambdaConstraintType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedLambdaConstraintType.java index 19c7ee1e2a..4b1c16d051 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedLambdaConstraintType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedLambdaConstraintType.java @@ -20,7 +20,7 @@ */ package com.github.javaparser.resolution.types; -public class ResolvedLambdaConstraintType implements ResolvedType { +public class ResolvedLambdaConstraintType implements ResolvedType { private ResolvedType bound; @@ -29,21 +29,21 @@ private ResolvedLambdaConstraintType(ResolvedType bound) { } @Override - public String describe() { + public String describe() { return "? super " + bound.describe(); } - public ResolvedType getBound() { + public ResolvedType getBound() { return bound; } @Override - public boolean isConstraint() { + public boolean isConstraint() { return true; } @Override - public ResolvedLambdaConstraintType asConstraintType() { + public ResolvedLambdaConstraintType asConstraintType() { return this; } @@ -52,12 +52,12 @@ public static ResolvedLambdaConstraintType bound(ResolvedType bound) { } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { return bound.isAssignableBy(other); } @Override - public String toString() { + public String toString() { return "LambdaConstraintType{" + "bound=" + bound + '}'; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java index a0e505848b..b4b0a85f2f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java @@ -29,7 +29,8 @@ /** * @author Federico Tomassetti */ -public enum ResolvedPrimitiveType implements ResolvedType { +public enum ResolvedPrimitiveType implements ResolvedType { + BYTE("byte", Byte.class, Collections.emptyList()), SHORT("short", Short.class, Collections.singletonList(BYTE)), CHAR("char", Character.class, Collections.emptyList()), @@ -96,45 +97,45 @@ public static Optional byBoxTypeQName(String qName) { * Returns an array containing all numeric types */ public static ResolvedPrimitiveType[] getNumericPrimitiveTypes() { - return new ResolvedPrimitiveType[] {BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, CHAR}; + return new ResolvedPrimitiveType[] { BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, CHAR }; } @Override - public String toString() { + public String toString() { return "PrimitiveTypeUsage{" + "name='" + name + '\'' + '}'; } - public ResolvedPrimitiveType asPrimitive() { + public ResolvedPrimitiveType asPrimitive() { return this; } @Override - public boolean isArray() { + public boolean isArray() { return false; } @Override - public boolean isPrimitive() { + public boolean isPrimitive() { return true; } @Override - public boolean isReferenceType() { + public boolean isReferenceType() { return false; } @Override - public String describe() { + public String describe() { return name; } @Override - public boolean isTypeVariable() { + public boolean isTypeVariable() { return false; } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { if (other.isPrimitive()) { return this == other || promotionTypes.contains(other); } @@ -149,29 +150,28 @@ public boolean isAssignableBy(ResolvedType other) { } return false; } - return other.isConstraint() - && this.isAssignableBy(other.asConstraintType().getBound()); + return other.isConstraint() && this.isAssignableBy(other.asConstraintType().getBound()); } - public String getBoxTypeQName() { + public String getBoxTypeQName() { return boxTypeClass.getCanonicalName(); } /* * Returns the boxed class of the primitive type. */ - public Class getBoxTypeClass() { + public Class getBoxTypeClass() { return boxTypeClass; } - public boolean isNumeric() { + public boolean isNumeric() { return Arrays.asList(getNumericPrimitiveTypes()).contains(this); } /** * Is this a boolean type? */ - public boolean isBoolean() { + public boolean isBoolean() { return this == BOOLEAN; } @@ -179,7 +179,7 @@ public boolean isBoolean() { * Binary primitive promotion (see https://docs.oracle.com/javase/specs/jls/se7/html/jls-5.html#jls-5.6.2) * If any operand is of a reference type, it is subjected to unboxing conversion (§5.1.8). */ - public ResolvedPrimitiveType bnp(ResolvedPrimitiveType other) { + public ResolvedPrimitiveType bnp(ResolvedPrimitiveType other) { if (this == ResolvedPrimitiveType.DOUBLE || other == ResolvedPrimitiveType.DOUBLE) { return ResolvedPrimitiveType.DOUBLE; // Otherwise, if either operand is of type float, the other is converted to float. @@ -204,29 +204,17 @@ public static ResolvedType unp(ResolvedType type) { // conversion (§5.1.8). // The result is then promoted to a value of type int by a widening primitive conversion (§5.1.2) or an identity // conversion (§5.1.1). - if (isUnboxable - && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { - ResolvedPrimitiveType.BYTE, - ResolvedPrimitiveType.SHORT, - ResolvedPrimitiveType.CHAR, - ResolvedPrimitiveType.INT - })) { + if (isUnboxable && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.SHORT, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.INT })) { return ResolvedPrimitiveType.INT; } // Otherwise, if the operand is of compile-time type Long, Float, or Double, it is subjected to unboxing // conversion (§5.1.8). - if (isUnboxable - && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { - ResolvedPrimitiveType.LONG, ResolvedPrimitiveType.FLOAT, ResolvedPrimitiveType.DOUBLE - })) { + if (isUnboxable && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.LONG, ResolvedPrimitiveType.FLOAT, ResolvedPrimitiveType.DOUBLE })) { return type.asReferenceType().toUnboxedType().get(); } // Otherwise, if the operand is of compile-time type byte, short, or char, it is promoted to a value of type int // by a widening primitive conversion (§5.1.2). - if (type.isPrimitive() - && type.asPrimitive().in(new ResolvedPrimitiveType[] { - ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.SHORT - })) { + if (type.isPrimitive() && type.asPrimitive().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.SHORT })) { return ResolvedPrimitiveType.INT; } // Otherwise, a unary numeric operand remains as is and is not converted. @@ -236,12 +224,12 @@ public static ResolvedType unp(ResolvedType type) { /* * Verify if the ResolvedPrimitiveType is in the list of ResolvedPrimitiveType */ - public boolean in(ResolvedPrimitiveType... types) { + public boolean in(ResolvedPrimitiveType... types) { return Arrays.stream(types).anyMatch(type -> this == type); } @Override - public String toDescriptor() { + public String toDescriptor() { return TypeUtils.getPrimitiveTypeDescriptor(boxTypeClass); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java index abaf1d83fb..94576a3cd5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java @@ -42,8 +42,7 @@ * * @author Federico Tomassetti */ -public abstract class ResolvedReferenceType - implements ResolvedType, ResolvedTypeParametrized, ResolvedTypeParameterValueProvider { +public abstract class ResolvedReferenceType implements ResolvedType, ResolvedTypeParametrized, ResolvedTypeParameterValueProvider { protected static String JAVA_LANG_ENUM = java.lang.Enum.class.getCanonicalName(); @@ -62,27 +61,23 @@ public abstract class ResolvedReferenceType // // Constructors // - public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration) { + public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration) { this(typeDeclaration, deriveParams(typeDeclaration)); } - public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration, List typeArguments) { + public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration, List typeArguments) { if (typeDeclaration == null) { throw new IllegalArgumentException("TypeDeclaration is not expected to be null"); } if (typeDeclaration.isTypeParameter()) { throw new IllegalArgumentException("You should use only Classes, Interfaces and enums"); } - if (typeArguments.size() > 0 - && typeArguments.size() != typeDeclaration.getTypeParameters().size()) { - throw new IllegalArgumentException(String.format( - "expected either zero type arguments or has many as defined in the declaration (%d). Found %d", - typeDeclaration.getTypeParameters().size(), typeArguments.size())); + if (typeArguments.size() > 0 && typeArguments.size() != typeDeclaration.getTypeParameters().size()) { + throw new IllegalArgumentException(String.format("expected either zero type arguments or has many as defined in the declaration (%d). Found %d", typeDeclaration.getTypeParameters().size(), typeArguments.size())); } ResolvedTypeParametersMap.Builder typeParametersMapBuilder = new ResolvedTypeParametersMap.Builder(); for (int i = 0; i < typeArguments.size(); i++) { - typeParametersMapBuilder.setValue( - typeDeclaration.getTypeParameters().get(i), typeArguments.get(i)); + typeParametersMapBuilder.setValue(typeDeclaration.getTypeParameters().get(i), typeArguments.get(i)); } this.typeParametersMap = typeParametersMapBuilder.build(); this.typeDeclaration = typeDeclaration; @@ -92,30 +87,36 @@ public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration, L // Public Object methods // @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null) + return false; if (o instanceof LazyType) { final LazyType lazyType = (LazyType) o; - if (!lazyType.isReferenceType()) return false; + if (!lazyType.isReferenceType()) + return false; return this.equals(lazyType.asReferenceType()); } - if (getClass() != o.getClass()) return false; + if (getClass() != o.getClass()) + return false; ResolvedReferenceType that = (ResolvedReferenceType) o; - if (!typeDeclaration.equals(that.typeDeclaration)) return false; - if (!typeParametersMap.equals(that.typeParametersMap)) return false; + if (!typeDeclaration.equals(that.typeDeclaration)) + return false; + if (!typeParametersMap.equals(that.typeParametersMap)) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { int result = typeDeclaration.hashCode(); result = 31 * result + typeParametersMap.hashCode(); return result; } @Override - public String toString() { + public String toString() { return "ReferenceType{" + getQualifiedName() + ", typeParametersMap=" + typeParametersMap + '}'; } @@ -131,7 +132,7 @@ public final boolean isReferenceType() { // / Downcasting // / @Override - public ResolvedReferenceType asReferenceType() { + public ResolvedReferenceType asReferenceType() { return this; } @@ -139,7 +140,7 @@ public ResolvedReferenceType asReferenceType() { // / Naming // / @Override - public String describe() { + public String describe() { StringBuilder sb = new StringBuilder(); if (hasName()) { sb.append(typeDeclaration.getQualifiedName()); @@ -148,11 +149,7 @@ public String describe() { } if (!typeParametersMap().isEmpty()) { sb.append("<"); - sb.append(String.join( - ", ", - typeDeclaration.getTypeParameters().stream() - .map(tp -> typeParametersMap().getValue(tp).describe()) - .collect(Collectors.toList()))); + sb.append(String.join(", ", typeDeclaration.getTypeParameters().stream().map(tp -> typeParametersMap().getValue(tp).describe()).collect(Collectors.toList()))); sb.append(">"); } return sb.toString(); @@ -167,10 +164,7 @@ public String describe() { public abstract ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer); @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tpToReplace, - ResolvedType replaced, - Map inferredTypes) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map inferredTypes) { if (replaced == null) { throw new IllegalArgumentException(); } @@ -184,8 +178,7 @@ public ResolvedType replaceTypeVariables( } // FIXME if (true) { - List typeParametersCorrected = - result.asReferenceType().typeParametersValues(); + List typeParametersCorrected = result.asReferenceType().typeParametersValues(); typeParametersCorrected.set(i, transformedTp); result = create(typeDeclaration, typeParametersCorrected); } @@ -236,8 +229,7 @@ public ResolvedType replaceTypeVariables( * This list should always include Object (unless this is a reference to Object). * The type typeParametersValues should be expressed in terms of this type typeParametersValues. */ - public abstract List getAllAncestors( - Function> traverser); + public abstract List getAllAncestors(Function> traverser); /** * Return direct ancestors, that means the superclasses and interfaces implemented directly. @@ -247,17 +239,11 @@ public abstract List getAllAncestors( public abstract List getDirectAncestors(); public final List getAllInterfacesAncestors() { - return getAllAncestors().stream() - .filter(it -> it.getTypeDeclaration().isPresent()) - .filter(it -> it.getTypeDeclaration().get().isInterface()) - .collect(Collectors.toList()); + return getAllAncestors().stream().filter(it -> it.getTypeDeclaration().isPresent()).filter(it -> it.getTypeDeclaration().get().isInterface()).collect(Collectors.toList()); } public final List getAllClassesAncestors() { - return getAllAncestors().stream() - .filter(it -> it.getTypeDeclaration().isPresent()) - .filter(it -> it.getTypeDeclaration().get().isClass()) - .collect(Collectors.toList()); + return getAllAncestors().stream().filter(it -> it.getTypeDeclaration().isPresent()).filter(it -> it.getTypeDeclaration().get().isClass()).collect(Collectors.toList()); } // / @@ -268,7 +254,7 @@ public final List getAllClassesAncestors() { * It returns Optional.empty unless the type declaration declares a type parameter with the given name. */ @Override - public Optional getGenericParameterByName(String name) { + public Optional getGenericParameterByName(String name) { for (ResolvedTypeParameterDeclaration tp : typeDeclaration.getTypeParameters()) { if (tp.getName().equals(name)) { return Optional.of(this.typeParametersMap().getValue(tp)); @@ -281,32 +267,26 @@ public Optional getGenericParameterByName(String name) { * Get the values for all type parameters declared on this type. * The list can be empty for raw types. */ - public List typeParametersValues() { - return this.typeParametersMap.isEmpty() - ? Collections.emptyList() - : typeDeclaration.getTypeParameters().stream() - .map(tp -> typeParametersMap.getValue(tp)) - .collect(Collectors.toList()); + public List typeParametersValues() { + return this.typeParametersMap.isEmpty() ? Collections.emptyList() : typeDeclaration.getTypeParameters().stream().map(tp -> typeParametersMap.getValue(tp)).collect(Collectors.toList()); } /** * Get the values for all type parameters declared on this type. * In case of raw types the values correspond to TypeVariables. */ - public List> getTypeParametersMap() { + public List> getTypeParametersMap() { List> typeParametersMap = new ArrayList<>(); if (!isRawType()) { for (int i = 0; i < typeDeclaration.getTypeParameters().size(); i++) { - typeParametersMap.add(new Pair<>( - typeDeclaration.getTypeParameters().get(i), - typeParametersValues().get(i))); + typeParametersMap.add(new Pair<>(typeDeclaration.getTypeParameters().get(i), typeParametersValues().get(i))); } } return typeParametersMap; } @Override - public ResolvedTypeParametersMap typeParametersMap() { + public ResolvedTypeParametersMap typeParametersMap() { return typeParametersMap; } @@ -324,7 +304,7 @@ public final Optional getTypeDeclaration() { * The type of the field could be different from the one in the corresponding FieldDeclaration because * type variables would be solved. */ - public Optional getFieldType(String name) { + public Optional getFieldType(String name) { if (!typeDeclaration.hasField(name)) { return Optional.empty(); } @@ -336,21 +316,21 @@ public Optional getFieldType(String name) { /** * Has the TypeDeclaration a name? Anonymous classes do not have one. */ - public boolean hasName() { + public boolean hasName() { return typeDeclaration.hasName(); } /** * Qualified name of the declaration. */ - public String getQualifiedName() { + public String getQualifiedName() { return typeDeclaration.getQualifiedName(); } /** * Id of the declaration. It corresponds to the qualified name, unless for local classes. */ - public String getId() { + public String getId() { return typeDeclaration.getId(); } @@ -372,7 +352,7 @@ public String getId() { * parameters [JLS, 4.8]. For example, the raw type corresponding to List is * List. */ - public boolean isRawType() { + public boolean isRawType() { if (!typeDeclaration.getTypeParameters().isEmpty()) { if (typeParametersMap().isEmpty()) { return true; @@ -382,7 +362,7 @@ public boolean isRawType() { } @Override - public Optional typeParamValue(ResolvedTypeParameterDeclaration typeParameterDeclaration) { + public Optional typeParamValue(ResolvedTypeParameterDeclaration typeParameterDeclaration) { if (typeParameterDeclaration.declaredOnMethod()) { throw new IllegalArgumentException(); } @@ -412,14 +392,13 @@ public Optional typeParamValue(ResolvedTypeParameterDeclaration ty * methods inherited. This list includes methods of all sort of visibility. However it does not include methods * that have been overwritten. */ - public List getAllMethods() { + public List getAllMethods() { if (!this.getTypeDeclaration().isPresent()) { // empty list -- consider IllegalStateException or similar return new ArrayList<>(); } // Get the methods declared directly on this. - List allMethods = - new LinkedList<>(this.getTypeDeclaration().get().getDeclaredMethods()); + List allMethods = new LinkedList<>(this.getTypeDeclaration().get().getDeclaredMethods()); // Also get methods inherited from ancestors. getDirectAncestors().forEach(a -> allMethods.addAll(a.getAllMethods())); return allMethods; @@ -429,33 +408,23 @@ public List getAllMethods() { * Fields which are visible to inheritors. They include all inherited fields which are visible to this * type plus all declared fields which are not private. */ - public List getAllFieldsVisibleToInheritors() { - List res = new LinkedList<>(this.getDeclaredFields().stream() - .filter(f -> f.accessSpecifier() != AccessSpecifier.PRIVATE) - .collect(Collectors.toList())); + public List getAllFieldsVisibleToInheritors() { + List res = new LinkedList<>(this.getDeclaredFields().stream().filter(f -> f.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList())); getDirectAncestors().forEach(a -> res.addAll(a.getAllFieldsVisibleToInheritors())); return res; } - public List getAllMethodsVisibleToInheritors() { - return this.getAllMethods().stream() - .filter(m -> m.accessSpecifier() != AccessSpecifier.PRIVATE) - .collect(Collectors.toList()); + public List getAllMethodsVisibleToInheritors() { + return this.getAllMethods().stream().filter(m -> m.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList()); } // // Protected methods // - protected abstract ResolvedReferenceType create( - ResolvedReferenceTypeDeclaration typeDeclaration, List typeParameters); + protected abstract ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, List typeParameters); - protected ResolvedReferenceType create( - ResolvedReferenceTypeDeclaration typeDeclaration, ResolvedTypeParametersMap typeParametersMap) { - return create( - typeDeclaration, - typeDeclaration.getTypeParameters().stream() - .map(typeParametersMap::getValue) - .collect(Collectors.toList())); + protected ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, ResolvedTypeParametersMap typeParametersMap) { + return create(typeDeclaration, typeDeclaration.getTypeParameters().stream().map(typeParametersMap::getValue).collect(Collectors.toList())); } protected abstract ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration); @@ -486,11 +455,9 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other) if (!thisParam.equals(otherParam)) { if (thisParam instanceof ResolvedWildcard) { ResolvedWildcard thisParamAsWildcard = (ResolvedWildcard) thisParam; - if (thisParamAsWildcard.isSuper() - && otherParam.isAssignableBy(thisParamAsWildcard.getBoundedType())) { + if (thisParamAsWildcard.isSuper() && otherParam.isAssignableBy(thisParamAsWildcard.getBoundedType())) { // ok - } else if (thisParamAsWildcard.isExtends() - && thisParamAsWildcard.getBoundedType().isAssignableBy(otherParam)) { + } else if (thisParamAsWildcard.isExtends() && thisParamAsWildcard.getBoundedType().isAssignableBy(otherParam)) { // ok } else if (!thisParamAsWildcard.isBounded()) { // ok @@ -503,27 +470,15 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other) // extends Comparable} // we have to compare the type of the erased bound (in this example the type @{code // Comparable}). - List thisBounds = - thisParam.asTypeVariable().asTypeParameter().getBounds().stream() - .map(ResolvedTypeParameterDeclaration.Bound::getType) - .map(type -> type.erasure()) - .collect(Collectors.toList()); - List otherBounds = - otherParam.asTypeVariable().asTypeParameter().getBounds().stream() - .map(ResolvedTypeParameterDeclaration.Bound::getType) - .map(type -> type.erasure()) - .collect(Collectors.toList()); + List thisBounds = thisParam.asTypeVariable().asTypeParameter().getBounds().stream().map(ResolvedTypeParameterDeclaration.Bound::getType).map(type -> type.erasure()).collect(Collectors.toList()); + List otherBounds = otherParam.asTypeVariable().asTypeParameter().getBounds().stream().map(ResolvedTypeParameterDeclaration.Bound::getType).map(type -> type.erasure()).collect(Collectors.toList()); return thisBounds.size() == otherBounds.size() && otherBounds.containsAll(thisBounds); } - if (!(thisParam instanceof ResolvedTypeVariable) - && otherParam instanceof ResolvedTypeVariable) { - return compareConsideringVariableTypeParameters( - thisParam, (ResolvedTypeVariable) otherParam); + if (!(thisParam instanceof ResolvedTypeVariable) && otherParam instanceof ResolvedTypeVariable) { + return compareConsideringVariableTypeParameters(thisParam, (ResolvedTypeVariable) otherParam); } - if (thisParam instanceof ResolvedTypeVariable - && !(otherParam instanceof ResolvedTypeVariable)) { - return compareConsideringVariableTypeParameters( - otherParam, (ResolvedTypeVariable) thisParam); + if (thisParam instanceof ResolvedTypeVariable && !(otherParam instanceof ResolvedTypeVariable)) { + return compareConsideringVariableTypeParameters(otherParam, (ResolvedTypeVariable) thisParam); } return false; } @@ -537,19 +492,15 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other) // // Private methods // - private boolean compareConsideringVariableTypeParameters( - ResolvedType referenceType, ResolvedTypeVariable typeVariable) { + private boolean compareConsideringVariableTypeParameters(ResolvedType referenceType, ResolvedTypeVariable typeVariable) { // verify if the ResolvedTypeVariable has only one type variable and the bound is // not a reference type with a bound parameter // for example EnumSet noneOf(Class elementType) List bounds = typeVariable.asTypeVariable().asTypeParameter().getBounds(); if (bounds.size() == 1) { ResolvedType boundType = bounds.get(0).getType(); - boolean hasTypeParameter = boundType.isReferenceType() - && !boundType.asReferenceType().typeParametersMap.isEmpty(); - return hasTypeParameter - ? compareConsideringTypeParameters(boundType.asReferenceType()) - : boundType.isAssignableBy(referenceType); + boolean hasTypeParameter = boundType.isReferenceType() && !boundType.asReferenceType().typeParametersMap.isEmpty(); + return hasTypeParameter ? compareConsideringTypeParameters(boundType.asReferenceType()) : boundType.isAssignableBy(referenceType); } return false; } @@ -575,33 +526,27 @@ private static List deriveParams(ResolvedReferenceTypeDeclaration * @see ResolvedReferenceTypeDeclaration#isJavaLangObject() * @see https://github.com/javaparser/javaparser/issues/2044 */ - public boolean isJavaLangObject() { - return this.isReferenceType() - && // Consider anonymous classes - hasName() - && getQualifiedName().equals(JAVA_LANG_OBJECT); + public boolean isJavaLangObject() { + return this.isReferenceType() && // Consider anonymous classes + hasName() && getQualifiedName().equals(JAVA_LANG_OBJECT); } /** * @return true, if this represents {@code java.lang.Enum} * @see ResolvedReferenceTypeDeclaration#isJavaLangEnum() */ - public boolean isJavaLangEnum() { - return this.isReferenceType() - && // Consider anonymous classes - hasName() - && getQualifiedName().equals(JAVA_LANG_ENUM); + public boolean isJavaLangEnum() { + return this.isReferenceType() && // Consider anonymous classes + hasName() && getQualifiedName().equals(JAVA_LANG_ENUM); } /** * @return true, if this represents {@code java.lang.Record} * @see ResolvedReferenceTypeDeclaration#isJavaLangRecord() */ - public boolean isJavaLangRecord() { - return this.isReferenceType() - && // Consider anonymous classes - hasName() - && getQualifiedName().equals(JAVA_LANG_RECORD); + public boolean isJavaLangRecord() { + return this.isReferenceType() && // Consider anonymous classes + hasName() && getQualifiedName().equals(JAVA_LANG_RECORD); } // / @@ -611,26 +556,23 @@ public boolean isJavaLangRecord() { * Returns true if the reference type can be unboxed to the primitive type * For example : Integer to int */ - public boolean isUnboxable() { - return Arrays.stream(ResolvedPrimitiveType.values()) - .anyMatch(pt -> getQualifiedName().equals(pt.getBoxTypeQName())); + public boolean isUnboxable() { + return Arrays.stream(ResolvedPrimitiveType.values()).anyMatch(pt -> getQualifiedName().equals(pt.getBoxTypeQName())); } /* * Returns true if the reference type can be unboxed to the specified primitive type * For example : Integer to int */ - public boolean isUnboxableTo(ResolvedPrimitiveType primitiveType) { + public boolean isUnboxableTo(ResolvedPrimitiveType primitiveType) { return primitiveType.getBoxTypeQName().equals(this.asReferenceType().describe()); } /* * Returns the optional corresponding primitive type */ - public Optional toUnboxedType() { - return Arrays.stream(ResolvedPrimitiveType.values()) - .filter(pt -> this.asReferenceType().getQualifiedName().equals(pt.getBoxTypeQName())) - .findFirst(); + public Optional toUnboxedType() { + return Arrays.stream(ResolvedPrimitiveType.values()).filter(pt -> this.asReferenceType().getQualifiedName().equals(pt.getBoxTypeQName())).findFirst(); } // / @@ -638,8 +580,9 @@ public Optional toUnboxedType() { // / // The erasure of a parameterized type (§4.5) G is |G|. @Override - public ResolvedType erasure() { - if (!typeDeclaration.isGeneric()) return this; + public ResolvedType erasure() { + if (!typeDeclaration.isGeneric()) + return this; return create(typeDeclaration, erasureOfParamaters(typeParametersMap)); } @@ -652,7 +595,7 @@ private boolean isJavaObject(ResolvedType rt) { } @Override - public String toDescriptor() { + public String toDescriptor() { return String.format("L%s;", getQualifiedName().replace(".", "/")); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java index 13d993971b..09432897fb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java @@ -47,7 +47,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedType { +public interface ResolvedType { // / // / Relation with other types @@ -177,10 +177,7 @@ default ResolvedUnionType asUnionType() { * By replacing these values I could also infer some type equivalence. * Those would be collected in the given map. */ - default ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tp, - ResolvedType replaced, - Map inferredTypes) { + default ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map inferredTypes) { return this; } @@ -210,8 +207,7 @@ default boolean mention(List typeParameters) { * Returns true if the ResolvedType is a numeric */ default boolean isNumericType() { - return Arrays.stream(ResolvedPrimitiveType.getNumericPrimitiveTypes()) - .anyMatch(rpt -> rpt.isAssignableBy(this)); + return Arrays.stream(ResolvedPrimitiveType.getNumericPrimitiveTypes()).anyMatch(rpt -> rpt.isAssignableBy(this)); } // / diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeTransformer.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeTransformer.java index 23d81597f0..46178671a5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeTransformer.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeTransformer.java @@ -24,7 +24,7 @@ * @author Federico Tomassetti */ @FunctionalInterface -public interface ResolvedTypeTransformer { +public interface ResolvedTypeTransformer { ResolvedType transform(ResolvedType type); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java index 865def1838..c2089596fd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java @@ -31,49 +31,51 @@ * * @author Federico Tomassetti */ -public class ResolvedTypeVariable implements ResolvedType { +public class ResolvedTypeVariable implements ResolvedType { private ResolvedTypeParameterDeclaration typeParameter; - public ResolvedTypeVariable(ResolvedTypeParameterDeclaration typeParameter) { + public ResolvedTypeVariable(ResolvedTypeParameterDeclaration typeParameter) { this.typeParameter = typeParameter; } @Override - public String toString() { + public String toString() { return "TypeVariable {" + typeParameter.toString() + "}"; } - public String qualifiedName() { + public String qualifiedName() { return this.typeParameter.getQualifiedName(); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; ResolvedTypeVariable that = (ResolvedTypeVariable) o; - if (!typeParameter.getName().equals(that.typeParameter.getName())) return false; - if (typeParameter.declaredOnType() != that.typeParameter.declaredOnType()) return false; - if (typeParameter.declaredOnMethod() != that.typeParameter.declaredOnMethod()) return false; + if (!typeParameter.getName().equals(that.typeParameter.getName())) + return false; + if (typeParameter.declaredOnType() != that.typeParameter.declaredOnType()) + return false; + if (typeParameter.declaredOnMethod() != that.typeParameter.declaredOnMethod()) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { return typeParameter.hashCode(); } @Override - public boolean isArray() { + public boolean isArray() { return false; } @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tpToBeReplaced, - ResolvedType replaced, - Map inferredTypes) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToBeReplaced, ResolvedType replaced, Map inferredTypes) { if (tpToBeReplaced.getName().equals(this.typeParameter.getName())) { inferredTypes.put(this.asTypeParameter(), replaced); return replaced; @@ -82,46 +84,37 @@ public ResolvedType replaceTypeVariables( } @Override - public boolean isReferenceType() { + public boolean isReferenceType() { return false; } @Override - public String describe() { + public String describe() { return typeParameter.getName(); } @Override - public ResolvedTypeParameterDeclaration asTypeParameter() { + public ResolvedTypeParameterDeclaration asTypeParameter() { return typeParameter; } @Override - public ResolvedTypeVariable asTypeVariable() { + public ResolvedTypeVariable asTypeVariable() { return this; } @Override - public boolean isTypeVariable() { + public boolean isTypeVariable() { return true; } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { if (other.isTypeVariable()) { // if we want to compare something like @{code C extends Comparable} with @{code K extends Comparable} // we have to compare the type of the bound. For the moment we are focusing solely on the first type. - if (typeParameter.hasBound() - && other.asTypeVariable().asTypeParameter().hasBound()) { - return typeParameter - .getBounds() - .get(0) - .getType() - .isAssignableBy(other.asTypeVariable() - .asTypeParameter() - .getBounds() - .get(0) - .getType()); + if (typeParameter.hasBound() && other.asTypeVariable().asTypeParameter().hasBound()) { + return typeParameter.getBounds().get(0).getType().isAssignableBy(other.asTypeVariable().asTypeParameter().getBounds().get(0).getType()); } return describe().equals(other.describe()); } @@ -129,7 +122,7 @@ public boolean isAssignableBy(ResolvedType other) { } @Override - public boolean mention(List typeParameters) { + public boolean mention(List typeParameters) { return typeParameters.contains(typeParameter); } @@ -140,7 +133,7 @@ public boolean mention(List typeParameters) { // If no bound is declared for a type variable, Object is assumed. // @Override - public ResolvedType erasure() { + public ResolvedType erasure() { if (typeParameter.isBounded()) { return typeParameter.getBounds().get(0).getType(); } @@ -151,12 +144,12 @@ public ResolvedType erasure() { * Returns the resolved type for a type variable. */ @Override - public ResolvedType solveGenericTypes(Context context) { + public ResolvedType solveGenericTypes(Context context) { return context.solveGenericType(describe()).orElse(this); } @Override - public String toDescriptor() { + public String toDescriptor() { return String.format("L%s;", qualifiedName()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java index 3b0d9f790d..f66c5bd6f7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java @@ -29,67 +29,65 @@ * * @author Federico Tomassetti */ -public class ResolvedUnionType implements ResolvedType { +public class ResolvedUnionType implements ResolvedType { private List elements; - public ResolvedUnionType(List elements) { + public ResolvedUnionType(List elements) { if (elements.size() < 2) { - throw new IllegalArgumentException( - "An union type should have at least two elements. This has " + elements.size()); + throw new IllegalArgumentException("An union type should have at least two elements. This has " + elements.size()); } this.elements = new LinkedList<>(elements); } - public Optional getCommonAncestor() { - Optional> reduce = elements.stream() - .map(ResolvedType::asReferenceType) - .map(rt -> rt.getAllAncestors(ResolvedReferenceTypeDeclaration.breadthFirstFunc)) - .reduce((a, b) -> { - ArrayList common = new ArrayList<>(a); - common.retainAll(b); - return common; - }); + public Optional getCommonAncestor() { + Optional> reduce = elements.stream().map(ResolvedType::asReferenceType).map(rt -> rt.getAllAncestors(ResolvedReferenceTypeDeclaration.breadthFirstFunc)).reduce((a, b) -> { + ArrayList common = new ArrayList<>(a); + common.retainAll(b); + return common; + }); return reduce.orElse(new ArrayList<>()).stream().findFirst(); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; ResolvedUnionType that = (ResolvedUnionType) o; return new HashSet<>(elements).equals(new HashSet<>(that.elements)); } @Override - public int hashCode() { + public int hashCode() { return new HashSet<>(elements).hashCode(); } @Override - public String describe() { + public String describe() { return String.join(" | ", elements.stream().map(ResolvedType::describe).collect(Collectors.toList())); } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { return elements.stream().allMatch(e -> e.isAssignableBy(other)); } @Override - public boolean isUnionType() { + public boolean isUnionType() { return true; } @Override - public ResolvedUnionType asUnionType() { + public ResolvedUnionType asUnionType() { return this; } /* * Returns the list of the resolved types */ - public List getElements() { + public List getElements() { return elements; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java index e293723d64..7e2e0cc0ba 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java @@ -25,19 +25,20 @@ * * @author Federico Tomassetti */ -public class ResolvedVoidType implements ResolvedType { +public class ResolvedVoidType implements ResolvedType { public static final ResolvedType INSTANCE = new ResolvedVoidType(); - private ResolvedVoidType() {} + private ResolvedVoidType() { + } @Override - public String describe() { + public String describe() { return "void"; } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { // According to https://docs.oracle.com/javase/specs/jls/se16/html/jls-14.html#jls-14.8: // """ // Note that the Java programming language does not allow a "cast to void" - void is not a type - so the @@ -53,12 +54,12 @@ public boolean isAssignableBy(ResolvedType other) { } @Override - public boolean isVoid() { + public boolean isVoid() { return true; } @Override - public String toDescriptor() { + public String toDescriptor() { return "V"; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java index 70aec83a0b..56d6f29c3f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java @@ -34,7 +34,7 @@ * * @author Federico Tomassetti */ -public class ResolvedWildcard implements ResolvedType { +public class ResolvedWildcard implements ResolvedType { public static ResolvedWildcard UNBOUNDED = new ResolvedWildcard(null, null); @@ -62,39 +62,43 @@ public static ResolvedWildcard extendsBound(ResolvedType type) { } @Override - public String toString() { + public String toString() { return "WildcardUsage{" + "type=" + type + ", boundedType=" + boundedType + '}'; } @Override - public boolean isWildcard() { + public boolean isWildcard() { return true; } @Override - public ResolvedWildcard asWildcard() { + public ResolvedWildcard asWildcard() { return this; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ResolvedWildcard)) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof ResolvedWildcard)) + return false; ResolvedWildcard that = (ResolvedWildcard) o; - if (boundedType != null ? !boundedType.equals(that.boundedType) : that.boundedType != null) return false; - if (type != that.type) return false; + if (boundedType != null ? !boundedType.equals(that.boundedType) : that.boundedType != null) + return false; + if (type != that.type) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { int result = type != null ? type.hashCode() : 0; result = 31 * result + (boundedType != null ? boundedType.hashCode() : 0); return result; } @Override - public String describe() { + public String describe() { if (type == null) { return "?"; } @@ -107,19 +111,19 @@ public String describe() { throw new UnsupportedOperationException(); } - public boolean isSuper() { + public boolean isSuper() { return type == BoundType.SUPER; } - public boolean isExtends() { + public boolean isExtends() { return type == BoundType.EXTENDS; } - public boolean isBounded() { + public boolean isBounded() { return isSuper() || isExtends(); } - public ResolvedType getBoundedType() { + public ResolvedType getBoundedType() { if (boundedType == null) { throw new IllegalStateException(); } @@ -127,7 +131,7 @@ public ResolvedType getBoundedType() { } @Override - public boolean isAssignableBy(ResolvedType other) { + public boolean isAssignableBy(ResolvedType other) { if (boundedType == null) { // return other.isReferenceType() && // other.asReferenceType().getQualifiedName().equals(Object.class.getCanonicalName()); @@ -143,10 +147,7 @@ public boolean isAssignableBy(ResolvedType other) { } @Override - public ResolvedType replaceTypeVariables( - ResolvedTypeParameterDeclaration tpToReplace, - ResolvedType replaced, - Map inferredTypes) { + public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map inferredTypes) { if (replaced == null) { throw new IllegalArgumentException(); } @@ -164,28 +165,28 @@ public ResolvedType replaceTypeVariables( } @Override - public boolean mention(List typeParameters) { + public boolean mention(List typeParameters) { return boundedType != null && boundedType.mention(typeParameters); } - public boolean isUpperBounded() { + public boolean isUpperBounded() { return isExtends(); } - public boolean isLowerBounded() { + public boolean isLowerBounded() { return isSuper(); } - public enum BoundType { - SUPER, - EXTENDS + public enum BoundType { + + SUPER, EXTENDS } /* * Returns the bounded resolved type. */ @Override - public ResolvedType solveGenericTypes(Context context) { + public ResolvedType solveGenericTypes(Context context) { if (isExtends() || isSuper()) { ResolvedType boundResolved = getBoundedType().solveGenericTypes(context); if (isExtends()) { @@ -203,7 +204,7 @@ public ResolvedType solveGenericTypes(Context context) { // This method returns null if no bound is declared. This is probably a limitation. // @Override - public ResolvedType erasure() { + public ResolvedType erasure() { return boundedType; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java index f7d7572501..2e4548d2dd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java @@ -28,7 +28,7 @@ /** * @author Federico Tomassetti */ -public interface ResolvedTypeParameterValueProvider { +public interface ResolvedTypeParameterValueProvider { /** * Calculate the value for the given type parameter. @@ -49,10 +49,7 @@ default ResolvedType useThisTypeParametersOnTheGivenType(ResolvedType type) { ResolvedType resolvedTypeParam = typeParam.get(); // Try to avoid an infinite loop when the type is a wildcard type bounded by a type variable like "? // super T" - if (resolvedTypeParam.isWildcard() - && (!resolvedTypeParam.asWildcard().equals(ResolvedWildcard.UNBOUNDED) - && type.equals( - resolvedTypeParam.asWildcard().getBoundedType()))) { + if (resolvedTypeParam.isWildcard() && (!resolvedTypeParam.asWildcard().equals(ResolvedWildcard.UNBOUNDED) && type.equals(resolvedTypeParam.asWildcard().getBoundedType()))) { return type; } type = resolvedTypeParam; @@ -61,11 +58,9 @@ default ResolvedType useThisTypeParametersOnTheGivenType(ResolvedType type) { } if (type.isWildcard() && type.asWildcard().isBounded()) { if (type.asWildcard().isExtends()) { - return ResolvedWildcard.extendsBound( - useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType())); + return ResolvedWildcard.extendsBound(useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType())); } - return ResolvedWildcard.superBound( - useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType())); + return ResolvedWildcard.superBound(useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType())); } if (type.isReferenceType()) { type = type.asReferenceType().transformTypeParameters(this::useThisTypeParametersOnTheGivenType); diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java index 438da1e058..559273c396 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java @@ -30,7 +30,7 @@ * * @author Federico Tomassetti */ -public class ResolvedTypeParametersMap { +public class ResolvedTypeParametersMap { public static class Builder { @@ -38,25 +38,23 @@ public static class Builder { private Map nameToDeclaration; - public Builder() { + public Builder() { nameToValue = new HashMap<>(); nameToDeclaration = new HashMap<>(); } - private Builder( - Map nameToValue, - Map nameToDeclaration) { + private Builder(Map nameToValue, Map nameToDeclaration) { this.nameToValue = new HashMap<>(); this.nameToValue.putAll(nameToValue); this.nameToDeclaration = new HashMap<>(); this.nameToDeclaration.putAll(nameToDeclaration); } - public ResolvedTypeParametersMap build() { + public ResolvedTypeParametersMap build() { return new ResolvedTypeParametersMap(nameToValue, nameToDeclaration); } - public Builder setValue(ResolvedTypeParameterDeclaration typeParameter, ResolvedType value) { + public Builder setValue(ResolvedTypeParameterDeclaration typeParameter, ResolvedType value) { // TODO: we shouldn't just silently overwrite existing types! String qualifiedName = typeParameter.getQualifiedName(); nameToValue.put(qualifiedName, value); @@ -66,20 +64,22 @@ public Builder setValue(ResolvedTypeParameterDeclaration typeParameter, Resolved } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ResolvedTypeParametersMap)) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof ResolvedTypeParametersMap)) + return false; ResolvedTypeParametersMap that = (ResolvedTypeParametersMap) o; return nameToValue.equals(that.nameToValue) && nameToDeclaration.equals(that.nameToDeclaration); } @Override - public int hashCode() { + public int hashCode() { return nameToValue.hashCode(); } @Override - public String toString() { + public String toString() { return "TypeParametersMap{" + "nameToValue=" + nameToValue + '}'; } @@ -91,15 +91,14 @@ public static ResolvedTypeParametersMap empty() { return new Builder().build(); } - private ResolvedTypeParametersMap( - Map nameToValue, Map nameToDeclaration) { + private ResolvedTypeParametersMap(Map nameToValue, Map nameToDeclaration) { this.nameToValue = new HashMap<>(); this.nameToValue.putAll(nameToValue); this.nameToDeclaration = new HashMap<>(); this.nameToDeclaration.putAll(nameToDeclaration); } - public ResolvedType getValue(ResolvedTypeParameterDeclaration typeParameter) { + public ResolvedType getValue(ResolvedTypeParameterDeclaration typeParameter) { String qualifiedName = typeParameter.getQualifiedName(); if (nameToValue.containsKey(qualifiedName)) { return nameToValue.get(qualifiedName); @@ -107,34 +106,33 @@ public ResolvedType getValue(ResolvedTypeParameterDeclaration typeParameter) { return new ResolvedTypeVariable(typeParameter); } - public Optional getValueBySignature(String signature) { + public Optional getValueBySignature(String signature) { if (nameToValue.containsKey(signature)) { return Optional.of(nameToValue.get(signature)); } return Optional.empty(); } - public List getNames() { + public List getNames() { return new ArrayList<>(nameToValue.keySet()); } - public List getTypes() { + public List getTypes() { return new ArrayList<>(nameToValue.values()); } - public Builder toBuilder() { + public Builder toBuilder() { return new Builder(nameToValue, nameToDeclaration); } - public boolean isEmpty() { + public boolean isEmpty() { return nameToValue.isEmpty(); } - public ResolvedType replaceAll(ResolvedType type) { + public ResolvedType replaceAll(ResolvedType type) { Map inferredTypes = new HashMap<>(); for (ResolvedTypeParameterDeclaration typeParameterDeclaration : this.nameToDeclaration.values()) { - type = type.replaceTypeVariables( - typeParameterDeclaration, getValue(typeParameterDeclaration), inferredTypes); + type = type.replaceTypeVariables(typeParameterDeclaration, getValue(typeParameterDeclaration), inferredTypes); } return type; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametrized.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametrized.java index 18a754cd71..d266516e1f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametrized.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametrized.java @@ -25,7 +25,7 @@ * * @author Federico Tomassetti */ -public interface ResolvedTypeParametrized { +public interface ResolvedTypeParametrized { ResolvedTypeParametersMap typeParametersMap(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/ClassUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ClassUtils.java index d50864bd3f..d7fd98a9f3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/ClassUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ClassUtils.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -public class ClassUtils { +public class ClassUtils { /** * Maps primitive {@code Class}es to their corresponding wrapper {@code Class}. diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java index 6404ee9bd1..6273630744 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java @@ -22,7 +22,6 @@ import static com.github.javaparser.utils.Utils.capitalize; import static com.github.javaparser.utils.Utils.decapitalize; - import java.io.File; import java.net.URISyntaxException; import java.nio.file.Path; @@ -33,7 +32,8 @@ */ public final class CodeGenerationUtils { - private CodeGenerationUtils() {} + private CodeGenerationUtils() { + } public static String getterName(Class type, String name) { if (name.startsWith("is") && boolean.class.equals(type)) { @@ -131,8 +131,7 @@ public static Path packageAbsolutePath(Path root, String pkg) { */ public static Path classLoaderRoot(Class c) { try { - return Paths.get( - c.getProtectionDomain().getCodeSource().getLocation().toURI()); + return Paths.get(c.getProtectionDomain().getCodeSource().getLocation().toURI()); } catch (URISyntaxException e) { throw new AssertionError("Bug in JavaParser, please report.", e); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java index fd5085f6e1..e0d314d771 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java @@ -35,7 +35,7 @@ * A strategy for discovering the structure of a project. * Implementations could read a pom.xml, a Gradle build file, a makefile... */ -public interface CollectionStrategy { +public interface CollectionStrategy { ParserConfiguration getParserConfiguration(); @@ -47,8 +47,7 @@ default Optional getRoot(Path file) { final ParseResult parseResult = javaParser.parse(file); if (parseResult.isSuccessful()) { if (parseResult.getResult().isPresent()) { - final Optional storage = - parseResult.getResult().flatMap(CompilationUnit::getStorage); + final Optional storage = parseResult.getResult().flatMap(CompilationUnit::getStorage); if (storage.isPresent()) { if ("module-info.java".equals(storage.get().getFileName())) { // module-info.java is useless for finding the source root, since it can be placed in any @@ -57,15 +56,12 @@ default Optional getRoot(Path file) { } return storage.map(CompilationUnit.Storage::getSourceRoot); } - Log.info( - "Storage information not present -- an issue with providing a string rather than file reference?"); + Log.info("Storage information not present -- an issue with providing a string rather than file reference?"); } Log.info("Parse result not present"); } Log.info("Parsing was not successful."); - Log.info( - "There were (%d) problems parsing file: %s", - () -> parseResult.getProblems().size(), parseResult::getProblems); + Log.info("There were (%d) problems parsing file: %s", () -> parseResult.getProblems().size(), parseResult::getProblems); } catch (ParseProblemException e) { Log.info("Problem parsing file %s : %s", () -> file, () -> e.getLocalizedMessage()); } catch (RuntimeException e) { diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java b/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java index a226d632d4..b548d169d1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java @@ -29,7 +29,7 @@ * @author Roger Howell * @see https://github.com/javaparser/javaparser/issues/2647 */ -public enum LineSeparator { +public enum LineSeparator { /** * The CR {@code \r} line ending is the default line separator for classic MacOS @@ -46,10 +46,7 @@ public enum LineSeparator { /** * This line ending is set to whatever the host system's line separator is */ - SYSTEM( - System.getProperty("line.separator"), - "SYSTEM : (" - + System.getProperty("line.separator").replace("\r", "\\r").replace("\n", "\\n") + ")"), + SYSTEM(System.getProperty("line.separator"), "SYSTEM : (" + System.getProperty("line.separator").replace("\r", "\\r").replace("\n", "\\n") + ")"), /** * The ARBITRARY line ending can be used where we do not care about the line separator, * only that we use the same one consistently @@ -148,26 +145,26 @@ public static Optional lookupEscaped(String ending) { return Optional.empty(); } - public String describe() { + public String describe() { // TODO: Return a generated description rather than one hardcoded via constructor. return description; } - public boolean equalsString(LineSeparator lineSeparator) { + public boolean equalsString(LineSeparator lineSeparator) { return text.equals(lineSeparator.asRawString()); } - public boolean isStandardEol() { + public boolean isStandardEol() { // Compare based on the strings to allow for e.g. LineSeparator.SYSTEM return equalsString(LineSeparator.CR) || equalsString(LineSeparator.LF) || equalsString(LineSeparator.CRLF); } - public String asEscapedString() { + public String asEscapedString() { String result = text.replace("\r", "\\r").replace("\n", "\\n"); return result; } - public String asRawString() { + public String asRawString() { return text; } @@ -183,7 +180,7 @@ public String asRawString() { // return Optional.empty(); // } @Override - public String toString() { + public String toString() { return asRawString(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java index 04331acb25..bd61b7a508 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java @@ -21,7 +21,6 @@ package com.github.javaparser.utils; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; @@ -32,7 +31,7 @@ *

    * See a blog about this */ -public class Log { +public class Log { /** * This adapter logs to standard out and standard error. @@ -40,17 +39,17 @@ public class Log { public static class StandardOutStandardErrorAdapter implements Adapter { @Override - public void info(Supplier messageSupplier) { + public void info(Supplier messageSupplier) { System.out.println(messageSupplier.get()); } @Override - public void trace(Supplier messageSupplier) { + public void trace(Supplier messageSupplier) { System.out.println(messageSupplier.get()); } @Override - public void error(Supplier throwableSupplier, Supplier messageSupplier) { + public void error(Supplier throwableSupplier, Supplier messageSupplier) { Throwable throwable = throwableSupplier.get(); String message = messageSupplier.get(); if (message == null) { @@ -66,7 +65,7 @@ public void error(Supplier throwableSupplier, Supplier messag private void printStackTrace(Throwable throwable) { try (StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw)) { + PrintWriter pw = new PrintWriter(sw)) { throwable.printStackTrace(pw); trace(sw::toString); } catch (IOException e) { @@ -81,16 +80,19 @@ private void printStackTrace(Throwable throwable) { public static class SilentAdapter implements Adapter { @Override - public void info(Supplier messageSupplier) {} + public void info(Supplier messageSupplier) { + } @Override - public void trace(Supplier messageSupplier) {} + public void trace(Supplier messageSupplier) { + } @Override - public void error(Supplier throwableSupplier, Supplier messageSupplier) {} + public void error(Supplier throwableSupplier, Supplier messageSupplier) { + } } - public interface Adapter { + public interface Adapter { void info(Supplier message); diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java index c5f7f90d8d..db8413936f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java @@ -21,7 +21,6 @@ package com.github.javaparser.utils; import static com.github.javaparser.utils.CodeGenerationUtils.f; - import java.util.Objects; /** @@ -30,35 +29,39 @@ * @param type of object a. * @param type of object b. */ -public class Pair { +public class Pair { public final A a; public final B b; - public Pair(A a, B b) { + public Pair(A a, B b) { this.a = a; this.b = b; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Pair pair = (Pair) o; - if (!Objects.equals(a, pair.a)) return false; - if (!Objects.equals(b, pair.b)) return false; + if (!Objects.equals(a, pair.a)) + return false; + if (!Objects.equals(b, pair.b)) + return false; return true; } @Override - public int hashCode() { + public int hashCode() { int result = a != null ? a.hashCode() : 0; return 31 * result + (b != null ? b.hashCode() : 0); } @Override - public String toString() { + public String toString() { return f("<%s, %s>", a, b); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java index 46ec901fb2..5437591173 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java @@ -21,7 +21,6 @@ package com.github.javaparser.utils; import static java.nio.file.FileVisitResult.*; - import com.github.javaparser.ParserConfiguration; import java.io.IOException; import java.nio.file.*; @@ -36,25 +35,25 @@ * Note that any build artifacts will also be detected: jar files in target directories and so on. * Note that if your project has a module-info.java file, ensure that you have set the language level to at least 9. */ -public class ParserCollectionStrategy implements CollectionStrategy { +public class ParserCollectionStrategy implements CollectionStrategy { private final ParserConfiguration parserConfiguration; - public ParserCollectionStrategy() { + public ParserCollectionStrategy() { this(new ParserConfiguration()); } - public ParserCollectionStrategy(ParserConfiguration parserConfiguration) { + public ParserCollectionStrategy(ParserConfiguration parserConfiguration) { this.parserConfiguration = parserConfiguration; } @Override - public ParserConfiguration getParserConfiguration() { + public ParserConfiguration getParserConfiguration() { return parserConfiguration; } @Override - public ProjectRoot collect(Path path) { + public ProjectRoot collect(Path path) { ProjectRoot projectRoot = new ProjectRoot(path, parserConfiguration); try { Files.walkFileTree(path, new SimpleFileVisitor() { @@ -64,7 +63,7 @@ public ProjectRoot collect(Path path) { final PathMatcher javaMatcher = getPathMatcher("glob:**.java"); @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { if ("module-info.java".equals(file.getFileName().toString())) { // module-info.java is useless for finding the source root, since it can be placed within any // directory. @@ -80,7 +79,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { } @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { if (Files.isHidden(dir) || (current_root != null && dir.startsWith(current_root))) { return SKIP_SUBTREE; } @@ -88,7 +87,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th } @Override - public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException { + public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException { if (current_root != null && Files.isSameFile(dir, current_root)) { projectRoot.addSourceRoot(dir); current_root = null; diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java index 22da02c53b..720ef665ff 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java @@ -21,7 +21,6 @@ package com.github.javaparser.utils; import static java.lang.Integer.signum; - import com.github.javaparser.Position; import com.github.javaparser.Range; import com.github.javaparser.ast.Modifier; @@ -111,10 +110,7 @@ private static Node firstNonAnnotationNode(Node node) { if (node instanceof ClassOrInterfaceDeclaration) { // Modifiers appear before the class name -- ClassOrInterfaceDeclaration casted = (ClassOrInterfaceDeclaration) node; - Modifier earliestModifier = casted.getModifiers().stream() - .filter(modifier -> modifier.hasRange()) - .min(Comparator.comparing(o -> o.getRange().get().begin)) - .orElse(null); + Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null); if (earliestModifier == null) { return casted.getName(); } @@ -123,10 +119,7 @@ private static Node firstNonAnnotationNode(Node node) { if (node instanceof MethodDeclaration) { // Modifiers appear before the class name -- MethodDeclaration casted = (MethodDeclaration) node; - Modifier earliestModifier = casted.getModifiers().stream() - .filter(modifier -> modifier.hasRange()) - .min(Comparator.comparing(o -> o.getRange().get().begin)) - .orElse(null); + Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null); if (earliestModifier == null) { return casted.getType(); } @@ -135,10 +128,7 @@ private static Node firstNonAnnotationNode(Node node) { if (node instanceof FieldDeclaration) { // Modifiers appear before the class name -- FieldDeclaration casted = (FieldDeclaration) node; - Modifier earliestModifier = casted.getModifiers().stream() - .filter(modifier -> modifier.hasRange()) - .min(Comparator.comparing(o -> o.getRange().get().begin)) - .orElse(null); + Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null); if (earliestModifier == null) { return casted.getVariable(0).getType(); } @@ -159,12 +149,10 @@ private static Node firstNonAnnotationNode(Node node) { */ public static boolean nodeContains(Node container, Node other, boolean ignoringAnnotations) { if (!container.hasRange()) { - throw new IllegalArgumentException( - "Cannot compare the positions of nodes if container node does not have a range."); + throw new IllegalArgumentException("Cannot compare the positions of nodes if container node does not have a range."); } if (!other.hasRange()) { - throw new IllegalArgumentException( - "Cannot compare the positions of nodes if contained node does not have a range."); + throw new IllegalArgumentException("Cannot compare the positions of nodes if contained node does not have a range."); } // // FIXME: Not all nodes seem to have the compilation unit available? // if (!Objects.equals(container.findCompilationUnit(), other.findCompilationUnit())) { @@ -187,10 +175,7 @@ public static boolean nodeContains(Node container, Node other, boolean ignoringA // If the node is contained, but it comes immediately after the annotations, // let's not consider it contained (i.e. it must be "strictly contained"). Node nodeWithoutAnnotations = firstNonAnnotationNode(container); - Range rangeWithoutAnnotations = container - .getRange() - .get() - .withBegin(nodeWithoutAnnotations.getBegin().get()); + Range rangeWithoutAnnotations = container.getRange().get().withBegin(nodeWithoutAnnotations.getBegin().get()); return // .contains(other.getRange().get()); rangeWithoutAnnotations.strictlyContains(other.getRange().get()); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java index 5bf4131bcf..4dc818d7f1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java @@ -35,7 +35,7 @@ *

    A project has a root directory, and it has zero or more directories that contain source code. *

    To create a ProjectRoot use a CollectionStrategy, or instantiate ProjectRoot yourself. */ -public class ProjectRoot { +public class ProjectRoot { private final Path root; @@ -43,33 +43,33 @@ public class ProjectRoot { private final ParserConfiguration parserConfiguration; - public ProjectRoot(Path root) { + public ProjectRoot(Path root) { this(root, new ParserConfiguration()); } - public ProjectRoot(Path root, ParserConfiguration parserConfiguration) { + public ProjectRoot(Path root, ParserConfiguration parserConfiguration) { this.root = root; this.parserConfiguration = parserConfiguration; } - public Optional getSourceRoot(Path sourceRoot) { + public Optional getSourceRoot(Path sourceRoot) { return Optional.ofNullable(cache.get(sourceRoot)); } - public List getSourceRoots() { + public List getSourceRoots() { return new ArrayList<>(cache.values()); } - public void addSourceRoot(Path path) { + public void addSourceRoot(Path path) { cache.put(path, new SourceRoot(path).setParserConfiguration(parserConfiguration)); } - public Path getRoot() { + public Path getRoot() { return root; } @Override - public String toString() { + public String toString() { return "ProjectRoot at " + root + " with " + cache.values().toString(); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/SeparatedItemStringBuilder.java b/javaparser-core/src/main/java/com/github/javaparser/utils/SeparatedItemStringBuilder.java index d9637d2235..735914d7b3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/SeparatedItemStringBuilder.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/SeparatedItemStringBuilder.java @@ -25,7 +25,7 @@ *
    Example: (1,2,3) which has prefix "(", separator ",", postfix ")" and the items 1 through 3. *

    Java 8 offers the very nice Collectors.joining(String, String, String) which does the same thing. */ -public class SeparatedItemStringBuilder { +public class SeparatedItemStringBuilder { private final String separator; @@ -35,7 +35,7 @@ public class SeparatedItemStringBuilder { private StringBuilder builder; - public SeparatedItemStringBuilder(String prefix, String separator, String postfix) { + public SeparatedItemStringBuilder(String prefix, String separator, String postfix) { builder = new StringBuilder(prefix); this.separator = separator; this.postfix = postfix; @@ -44,7 +44,7 @@ public SeparatedItemStringBuilder(String prefix, String separator, String postfi /** * Add one item. Either pass a string, or a format for String.format and corresponding arguments. */ - public SeparatedItemStringBuilder append(CharSequence format, Object... args) { + public SeparatedItemStringBuilder append(CharSequence format, Object... args) { if (hasItems) { builder.append(separator); } @@ -53,7 +53,7 @@ public SeparatedItemStringBuilder append(CharSequence format, Object... args) { return this; } - public boolean hasItems() { + public boolean hasItems() { return hasItems; } @@ -61,7 +61,7 @@ public boolean hasItems() { * Convert the builder into its final string representation. */ @Override - public String toString() { + public String toString() { // This order of toStringing avoids debuggers from making a mess. return builder.toString() + postfix; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java index 60c6ad6472..66c6daa71d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java @@ -25,7 +25,6 @@ import static com.github.javaparser.utils.CodeGenerationUtils.*; import static com.github.javaparser.utils.Utils.assertNotNull; import static java.nio.file.FileVisitResult.*; - import com.github.javaparser.JavaParser; import com.github.javaparser.ParseProblemException; import com.github.javaparser.ParseResult; @@ -59,15 +58,14 @@ *

  • methods ending in "...Parallelized" will speed up parsing by using multiple threads.
    • * */ -public class SourceRoot { +public class SourceRoot { @FunctionalInterface - public interface Callback { + public interface Callback { enum Result { - SAVE, - DONT_SAVE, - TERMINATE + + SAVE, DONT_SAVE, TERMINATE } /** @@ -86,14 +84,13 @@ enum Result { private Function printer = new DefaultPrettyPrinter()::print; - private static final Pattern JAVA_IDENTIFIER = - Pattern.compile("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*"); + private static final Pattern JAVA_IDENTIFIER = Pattern.compile("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*"); /** * @param root the root directory of a set of source files. It corresponds to the root of the package structure of the * source files within, like "javaparser/javaparser-core/src/main/java" */ - public SourceRoot(Path root) { + public SourceRoot(Path root) { assertNotNull(root); if (!Files.isDirectory(root)) { throw new IllegalArgumentException("Only directories are allowed as root path: " + root); @@ -106,7 +103,7 @@ public SourceRoot(Path root) { * @param root the root directory of a set of source files. It corresponds to the root of the package structure of the * source files within, like "javaparser/javaparser-core/src/main/java" */ - public SourceRoot(Path root, ParserConfiguration parserConfiguration) { + public SourceRoot(Path root, ParserConfiguration parserConfiguration) { this(root); setParserConfiguration(parserConfiguration); } @@ -119,8 +116,7 @@ public SourceRoot(Path root, ParserConfiguration parserConfiguration) { * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public ParseResult tryToParse( - String startPackage, String filename, ParserConfiguration configuration) throws IOException { + public ParseResult tryToParse(String startPackage, String filename, ParserConfiguration configuration) throws IOException { assertNotNull(startPackage); assertNotNull(filename); final Path relativePath = fileInPackageRelativePath(startPackage, filename); @@ -130,8 +126,7 @@ public ParseResult tryToParse( } final Path path = root.resolve(relativePath); Log.trace("Parsing %s", () -> path); - final ParseResult result = new JavaParser(configuration) - .parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding())); + final ParseResult result = new JavaParser(configuration).parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding())); result.getResult().ifPresent(cu -> cu.setStorage(path, configuration.getCharacterEncoding())); cache.put(relativePath, result); return result; @@ -145,7 +140,7 @@ public ParseResult tryToParse( * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public ParseResult tryToParse(String startPackage, String filename) throws IOException { + public ParseResult tryToParse(String startPackage, String filename) throws IOException { return tryToParse(startPackage, filename, parserConfiguration); } @@ -157,14 +152,14 @@ public ParseResult tryToParse(String startPackage, String filen * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public List> tryToParse(String startPackage) throws IOException { + public List> tryToParse(String startPackage) throws IOException { assertNotNull(startPackage); logPackage(startPackage); final Path path = packageAbsolutePath(root, startPackage); Files.walkFileTree(path, new SimpleFileVisitor() { @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { if (!attrs.isDirectory() && file.toString().endsWith(".java")) { Path relative = root.relativize(file.getParent()); tryToParse(relative.toString(), file.getFileName().toString()); @@ -173,7 +168,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO } @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { return isSensibleDirectoryToEnter(dir) ? CONTINUE : SKIP_SUBTREE; } }); @@ -183,8 +178,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th boolean isSensibleDirectoryToEnter(Path dir) throws IOException { final String dirToEnter = dir.getFileName().toString(); // Don't enter directories that cannot be packages. - final boolean directoryIsAValidJavaIdentifier = - JAVA_IDENTIFIER.matcher(dirToEnter).matches(); + final boolean directoryIsAValidJavaIdentifier = JAVA_IDENTIFIER.matcher(dirToEnter).matches(); // Don't enter directories that are hidden, assuming that people don't store source files in hidden directories. // But we can enter in root directory even if the root directory is not considered as a valid java identifier if (!root.equals(dir) && (Files.isHidden(dir) || !directoryIsAValidJavaIdentifier)) { @@ -200,7 +194,7 @@ boolean isSensibleDirectoryToEnter(Path dir) throws IOException { * the cache grows with every file parsed, so if you don't need saveAll(), or you don't ask SourceRoot to parse * files multiple times (where the cache is useful) you might want to use the parse method with a callback. */ - public List> tryToParse() throws IOException { + public List> tryToParse() throws IOException { return tryToParse(""); } @@ -216,7 +210,7 @@ public List> tryToParse() throws IOException { * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public List> tryToParseParallelized(String startPackage) { + public List> tryToParseParallelized(String startPackage) { assertNotNull(startPackage); logPackage(startPackage); final Path path = packageAbsolutePath(root, startPackage); @@ -245,7 +239,7 @@ public List> tryToParseParallelized(String startPac * file parsed, so if you don't need saveAll(), or you don't ask SourceRoot to parse files multiple times (where the * cache is useful) you might want to use the parse method with a callback. */ - public List> tryToParseParallelized() { + public List> tryToParseParallelized() { return tryToParseParallelized(""); } @@ -258,7 +252,7 @@ public List> tryToParseParallelized() { * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. * @throws ParseProblemException when something went wrong. */ - public CompilationUnit parse(String startPackage, String filename) { + public CompilationUnit parse(String startPackage, String filename) { assertNotNull(startPackage); assertNotNull(filename); try { @@ -272,14 +266,12 @@ public CompilationUnit parse(String startPackage, String filename) { } } - private FileVisitResult callback(Path absolutePath, ParserConfiguration configuration, Callback callback) - throws IOException { + private FileVisitResult callback(Path absolutePath, ParserConfiguration configuration, Callback callback) throws IOException { Path localPath = root.relativize(absolutePath); Log.trace("Parsing %s", () -> localPath); - ParseResult result = new JavaParser(configuration) - .parse(COMPILATION_UNIT, provider(absolutePath, configuration.getCharacterEncoding())); + ParseResult result = new JavaParser(configuration).parse(COMPILATION_UNIT, provider(absolutePath, configuration.getCharacterEncoding())); result.getResult().ifPresent(cu -> cu.setStorage(absolutePath, configuration.getCharacterEncoding())); - switch (callback.process(localPath, absolutePath, result)) { + switch(callback.process(localPath, absolutePath, result)) { case SAVE: result.getResult().ifPresent(cu -> save(cu, absolutePath)); case DONT_SAVE: @@ -298,8 +290,7 @@ private FileVisitResult callback(Path absolutePath, ParserConfiguration configur * @param startPackage The package containing the file * @param filename The name of the file */ - public SourceRoot parse(String startPackage, String filename, ParserConfiguration configuration, Callback callback) - throws IOException { + public SourceRoot parse(String startPackage, String filename, ParserConfiguration configuration, Callback callback) throws IOException { assertNotNull(startPackage); assertNotNull(filename); assertNotNull(configuration); @@ -312,7 +303,7 @@ public SourceRoot parse(String startPackage, String filename, ParserConfiguratio * Parses the provided .java file and passes it to the callback. In comparison to the other parse methods, this * makes is much more memory efficient., but saveAll() won't work. */ - public SourceRoot parse(String startPackage, String filename, Callback callback) throws IOException { + public SourceRoot parse(String startPackage, String filename, Callback callback) throws IOException { parse(startPackage, filename, parserConfiguration, callback); return this; } @@ -323,8 +314,7 @@ public SourceRoot parse(String startPackage, String filename, Callback callback) * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public SourceRoot parse(String startPackage, ParserConfiguration configuration, Callback callback) - throws IOException { + public SourceRoot parse(String startPackage, ParserConfiguration configuration, Callback callback) throws IOException { assertNotNull(startPackage); assertNotNull(configuration); assertNotNull(callback); @@ -334,7 +324,7 @@ public SourceRoot parse(String startPackage, ParserConfiguration configuration, Files.walkFileTree(path, new SimpleFileVisitor() { @Override - public FileVisitResult visitFile(Path absolutePath, BasicFileAttributes attrs) throws IOException { + public FileVisitResult visitFile(Path absolutePath, BasicFileAttributes attrs) throws IOException { if (!attrs.isDirectory() && absolutePath.toString().endsWith(".java")) { return callback(absolutePath, configuration, callback); } @@ -342,7 +332,7 @@ public FileVisitResult visitFile(Path absolutePath, BasicFileAttributes attrs) t } @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { return isSensibleDirectoryToEnter(dir) ? CONTINUE : SKIP_SUBTREE; } }); @@ -350,7 +340,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th return this; } - public SourceRoot parse(String startPackage, Callback callback) throws IOException { + public SourceRoot parse(String startPackage, Callback callback) throws IOException { parse(startPackage, parserConfiguration, callback); return this; } @@ -372,7 +362,7 @@ private void logPackage(String startPackage) { * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public SourceRoot parseParallelized(String startPackage, ParserConfiguration configuration, Callback callback) { + public SourceRoot parseParallelized(String startPackage, ParserConfiguration configuration, Callback callback) { assertNotNull(startPackage); assertNotNull(configuration); assertNotNull(callback); @@ -404,7 +394,7 @@ public SourceRoot parseParallelized(String startPackage, ParserConfiguration con * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public SourceRoot parseParallelized(String startPackage, Callback callback) throws IOException { + public SourceRoot parseParallelized(String startPackage, Callback callback) throws IOException { return parseParallelized(startPackage, this.parserConfiguration, callback); } @@ -415,7 +405,7 @@ public SourceRoot parseParallelized(String startPackage, Callback callback) thro * ensure thread safety, a new parser instance is created for every file. In comparison to the other parse methods, * this is much more memory efficient, but saveAll() won't work. */ - public SourceRoot parseParallelized(Callback callback) throws IOException { + public SourceRoot parseParallelized(Callback callback) throws IOException { return parseParallelized("", this.parserConfiguration, callback); } @@ -424,7 +414,7 @@ public SourceRoot parseParallelized(Callback callback) throws IOException { * * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files. */ - public SourceRoot add(String startPackage, String filename, CompilationUnit compilationUnit) { + public SourceRoot add(String startPackage, String filename, CompilationUnit compilationUnit) { assertNotNull(startPackage); assertNotNull(filename); assertNotNull(compilationUnit); @@ -439,13 +429,12 @@ public SourceRoot add(String startPackage, String filename, CompilationUnit comp * Add a newly created Java file to the cache of this source root. It will be saved when saveAll is called. It needs * to have its path set. */ - public SourceRoot add(CompilationUnit compilationUnit) { + public SourceRoot add(CompilationUnit compilationUnit) { assertNotNull(compilationUnit); if (compilationUnit.getStorage().isPresent()) { final Path path = compilationUnit.getStorage().get().getPath(); Log.trace("Adding new file %s", () -> path); - final ParseResult parseResult = - new ParseResult<>(compilationUnit, new ArrayList<>(), null); + final ParseResult parseResult = new ParseResult<>(compilationUnit, new ArrayList<>(), null); cache.put(path, parseResult); } else { throw new AssertionError("Files added with this method should have their path set."); @@ -481,7 +470,7 @@ private SourceRoot save(CompilationUnit cu, Path path, Charset encoding) { * @param root the root of the java packages * @param encoding the encoding to use while saving the file */ - public SourceRoot saveAll(Path root, Charset encoding) { + public SourceRoot saveAll(Path root, Charset encoding) { assertNotNull(root); Log.info("Saving all files (%s) to %s", cache::size, () -> root); for (Map.Entry> cu : cache.entrySet()) { @@ -498,14 +487,14 @@ public SourceRoot saveAll(Path root, Charset encoding) { * Save all previously parsed files back to a new path. * @param root the root of the java packages */ - public SourceRoot saveAll(Path root) { + public SourceRoot saveAll(Path root) { return saveAll(root, parserConfiguration.getCharacterEncoding()); } /** * Save all previously parsed files back to where they were found. */ - public SourceRoot saveAll() { + public SourceRoot saveAll() { return saveAll(root); } @@ -513,14 +502,14 @@ public SourceRoot saveAll() { * Save all previously parsed files back to where they were found, with the given encoding. * @param encoding the encoding to use. */ - public SourceRoot saveAll(Charset encoding) { + public SourceRoot saveAll(Charset encoding) { return saveAll(root, encoding); } /** * The Java files that have been parsed by this source root object, or have been added manually. */ - public List> getCache() { + public List> getCache() { return new ArrayList<>(cache.values()); } @@ -528,28 +517,25 @@ public List> getCache() { * The CompilationUnits of the Java files that have been parsed succesfully by this source root object, or have been * added manually. */ - public List getCompilationUnits() { - return cache.values().stream() - .filter(ParseResult::isSuccessful) - .map(p -> p.getResult().get()) - .collect(Collectors.toList()); + public List getCompilationUnits() { + return cache.values().stream().filter(ParseResult::isSuccessful).map(p -> p.getResult().get()).collect(Collectors.toList()); } /** * The path that was passed in the constructor. */ - public Path getRoot() { + public Path getRoot() { return root; } - public ParserConfiguration getParserConfiguration() { + public ParserConfiguration getParserConfiguration() { return parserConfiguration; } /** * Set the parser configuration that is used for parsing when no configuration is passed to a method. */ - public SourceRoot setParserConfiguration(ParserConfiguration parserConfiguration) { + public SourceRoot setParserConfiguration(ParserConfiguration parserConfiguration) { assertNotNull(parserConfiguration); this.parserConfiguration = parserConfiguration; return this; @@ -558,7 +544,7 @@ public SourceRoot setParserConfiguration(ParserConfiguration parserConfiguration /** * Set the printing function that transforms compilation units into a string to save. */ - public SourceRoot setPrinter(Function printer) { + public SourceRoot setPrinter(Function printer) { assertNotNull(printer); this.printer = printer; return this; @@ -567,7 +553,7 @@ public SourceRoot setPrinter(Function printer) { /** * Get the printing function. */ - public Function getPrinter() { + public Function getPrinter() { return printer; } @@ -598,7 +584,7 @@ protected void compute() { Files.walkFileTree(path, new SimpleFileVisitor() { @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { if (!root.isSensibleDirectoryToEnter(dir)) { return SKIP_SUBTREE; } @@ -612,7 +598,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th } @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { return callback.process(file, attrs); } }); @@ -631,7 +617,7 @@ interface VisitFileCallback { } @Override - public String toString() { + public String toString() { return "SourceRoot at " + root; } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java index 451a047373..648e2dbe49 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java @@ -23,7 +23,6 @@ import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.Utils.assertNotNull; - import com.github.javaparser.JavaParser; import com.github.javaparser.ParseResult; import com.github.javaparser.ParserConfiguration; @@ -41,7 +40,7 @@ * A collection of Java source files and its sub-directories located in a ZIP or JAR file on the file system. * Files can be parsed with a callback. */ -public class SourceZip { +public class SourceZip { private final Path zipPath; @@ -53,7 +52,7 @@ public class SourceZip { * * @param zipPath The absolute path of ZIP file to parse. */ - public SourceZip(Path zipPath) { + public SourceZip(Path zipPath) { this(zipPath, new ParserConfiguration()); } @@ -64,7 +63,7 @@ public SourceZip(Path zipPath) { * @param zipPath The absolute path of ZIP file to parse. * @param configuration The configuration to initiate the default parser with. */ - public SourceZip(Path zipPath, ParserConfiguration configuration) { + public SourceZip(Path zipPath, ParserConfiguration configuration) { assertNotNull(zipPath); assertNotNull(configuration); this.zipPath = zipPath.normalize(); @@ -80,7 +79,7 @@ public SourceZip(Path zipPath, ParserConfiguration configuration) { * * @throws IOException If an error occurs while trying to parse the given source. */ - public List>> parse() throws IOException { + public List>> parse() throws IOException { Log.info("Parsing zip at \"%s\"", () -> zipPath); List>> results = new ArrayList<>(); parse((path, result) -> results.add(new Pair<>(path, result))); @@ -95,15 +94,14 @@ public List>> parse() throws IOException * * @throws IOException If an error occurs while trying to parse the given source. */ - public SourceZip parse(Callback callback) throws IOException { + public SourceZip parse(Callback callback) throws IOException { Log.info("Parsing zip at \"%s\"", () -> zipPath); JavaParser javaParser = new JavaParser(parserConfiguration); try (ZipFile zipFile = new ZipFile(zipPath.toFile())) { for (ZipEntry entry : Collections.list(zipFile.entries())) { if (!entry.isDirectory() && entry.getName().endsWith(".java")) { Log.info("Parsing zip entry \"%s\"", () -> entry.getName()); - final ParseResult result = - javaParser.parse(COMPILATION_UNIT, provider(zipFile.getInputStream(entry))); + final ParseResult result = javaParser.parse(COMPILATION_UNIT, provider(zipFile.getInputStream(entry))); callback.process(Paths.get(entry.getName()), result); } } @@ -115,7 +113,7 @@ public SourceZip parse(Callback callback) throws IOException { * An interface to define a callback for each file that's parsed. */ @FunctionalInterface - public interface Callback { + public interface Callback { /** * Process the given parse result. @@ -131,15 +129,15 @@ public interface Callback { * * @return The absolute path of this ZIP file. */ - public Path getZipPath() { + public Path getZipPath() { return zipPath; } - public ParserConfiguration getParserConfiguration() { + public ParserConfiguration getParserConfiguration() { return parserConfiguration; } - public SourceZip setParserConfiguration(ParserConfiguration parserConfiguration) { + public SourceZip setParserConfiguration(ParserConfiguration parserConfiguration) { assertNotNull(parserConfiguration); this.parserConfiguration = parserConfiguration; return this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java index 10207a855a..295945de85 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java @@ -33,7 +33,8 @@ */ public final class StringEscapeUtils { - private StringEscapeUtils() {} + private StringEscapeUtils() { + } /** *

    Escapes the characters in a {@code String} using Java String rules.

    @@ -79,28 +80,15 @@ public static String unescapeJavaTextBlock(final String input) { } // TODO do we need to integrate /s escape sequence because there is a compilation error? - private static final LookupTranslator JAVA_CTRL_CHARS_UNESCAPE = new LookupTranslator( - new String[][] {{"\\b", "\b"}, {"\\n", "\n"}, {"\\t", "\t"}, {"\\f", "\f"}, {"\\r", "\r"}}); + private static final LookupTranslator JAVA_CTRL_CHARS_UNESCAPE = new LookupTranslator(new String[][] { { "\\b", "\b" }, { "\\n", "\n" }, { "\\t", "\t" }, { "\\f", "\f" }, { "\\r", "\r" } }); - private static final LookupTranslator JAVA_CTRL_CHARS_ESCAPE = new LookupTranslator( - new String[][] {{"\b", "\\b"}, {"\n", "\\n"}, {"\t", "\\t"}, {"\f", "\\f"}, {"\r", "\\r"}}); + private static final LookupTranslator JAVA_CTRL_CHARS_ESCAPE = new LookupTranslator(new String[][] { { "\b", "\\b" }, { "\n", "\\n" }, { "\t", "\\t" }, { "\f", "\\f" }, { "\r", "\\r" } }); - private static final CharSequenceTranslator ESCAPE_JAVA = new AggregateTranslator( - new LookupTranslator(new String[][] {{"\"", "\\\""}, {"\\", "\\\\"}}), JAVA_CTRL_CHARS_ESCAPE); + private static final CharSequenceTranslator ESCAPE_JAVA = new AggregateTranslator(new LookupTranslator(new String[][] { { "\"", "\\\"" }, { "\\", "\\\\" } }), JAVA_CTRL_CHARS_ESCAPE); - private static final CharSequenceTranslator UNESCAPE_JAVA = new AggregateTranslator( - new OctalUnescaper(), - new UnicodeUnescaper(), - JAVA_CTRL_CHARS_UNESCAPE, - new LookupTranslator(new String[][] {{"\\\\", "\\"}, {"\\\"", "\""}, {"\\'", "'"}, {"\\", ""}})); + private static final CharSequenceTranslator UNESCAPE_JAVA = new AggregateTranslator(new OctalUnescaper(), new UnicodeUnescaper(), JAVA_CTRL_CHARS_UNESCAPE, new LookupTranslator(new String[][] { { "\\\\", "\\" }, { "\\\"", "\"" }, { "\\'", "'" }, { "\\", "" } })); - private static final CharSequenceTranslator UNESCAPE_JAVA_TEXT_BLOCK = new AggregateTranslator( - new OctalUnescaper(), - new UnicodeUnescaper(), - JAVA_CTRL_CHARS_UNESCAPE, - new LookupTranslator( - new String[][] {{"\\\\", "\\"}, {"\\\"", "\""}, {"\\'", "'"}, {"\\", ""}, {"\\s", " "}, {"\\\n", ""} - })); + private static final CharSequenceTranslator UNESCAPE_JAVA_TEXT_BLOCK = new AggregateTranslator(new OctalUnescaper(), new UnicodeUnescaper(), JAVA_CTRL_CHARS_UNESCAPE, new LookupTranslator(new String[][] { { "\\\\", "\\" }, { "\\\"", "\"" }, { "\\'", "'" }, { "\\", "" }, { "\\s", " " }, { "\\\n", "" } })); /** * Adapted from apache commons-lang3 project. @@ -399,8 +387,7 @@ protected int translate(final CharSequence input, final int index, final Writer } return i + 4; } - throw new IllegalArgumentException("Less than 4 hex digits in unicode value: '" - + input.subSequence(index, input.length()) + "' due to end of CharSequence"); + throw new IllegalArgumentException("Less than 4 hex digits in unicode value: '" + input.subSequence(index, input.length()) + "' due to end of CharSequence"); } return 0; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java index f55a323db1..e1ef439b33 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java @@ -25,7 +25,7 @@ import java.lang.reflect.Method; import java.util.Optional; -public class TypeUtils { +public class TypeUtils { /* * Returns the method descriptor (https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.3) @@ -54,10 +54,7 @@ private static void appendDescriptor(final Class clazz, final StringBuilder s String descriptor = getPrimitiveTypeDescriptor(currentClass); stringBuilder.append(descriptor); } else { - stringBuilder - .append("L") - .append(currentClass.getName().replace(".", "/")) - .append(";"); + stringBuilder.append("L").append(currentClass.getName().replace(".", "/")).append(";"); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java index 123ec15046..a076ba8cb0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java @@ -21,7 +21,6 @@ package com.github.javaparser.utils; import static java.util.Arrays.asList; - import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.UnaryExpr; import java.io.IOException; @@ -34,7 +33,7 @@ * * @author Federico Tomassetti */ -public class Utils { +public class Utils { public static boolean isNullOrEmpty(Collection collection) { return collection == null || collection.isEmpty(); @@ -74,7 +73,7 @@ public static T assertPositive(T number) { public static String escapeEndOfLines(String string) { StringBuilder escapedString = new StringBuilder(); for (char c : string.toCharArray()) { - switch (c) { + switch(c) { case '\n': escapedString.append("\\n"); break; @@ -173,8 +172,7 @@ public static String decapitalize(String s) { return stringTransformer(s, "decapitalize", String::toLowerCase); } - private static String stringTransformer( - String s, String operationDescription, Function transformation) { + private static String stringTransformer(String s, String operationDescription, Function transformation) { if (s.isEmpty()) { throw new IllegalArgumentException(String.format("You cannot %s an empty string", operationDescription)); } @@ -282,7 +280,8 @@ public static String normalizeEolInTextBlock(String content, LineSeparator desir */ public static String removeFileExtension(String filename) { int extensionIndex = filename.lastIndexOf("."); - if (extensionIndex == -1) return filename; + if (extensionIndex == -1) + return filename; return filename.substring(0, extensionIndex); } @@ -300,10 +299,6 @@ public static String trimTrailingSpaces(String line) { * Checks, if the parent is a unary expression with a minus operator. Used to check for negative literals. */ public static boolean hasUnaryMinusAsParent(Node n) { - return n.getParentNode() - .filter(parent -> parent instanceof UnaryExpr) - .map(parent -> (UnaryExpr) parent) - .map(unaryExpr -> unaryExpr.getOperator() == UnaryExpr.Operator.MINUS) - .orElse(false); + return n.getParentNode().filter(parent -> parent instanceof UnaryExpr).map(parent -> (UnaryExpr) parent).map(unaryExpr -> unaryExpr.getOperator() == UnaryExpr.Operator.MINUS).orElse(false); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java index 0edcec07d5..0d6e719054 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java @@ -31,7 +31,7 @@ * A list that overrides the equals and hashcode calculation of the added nodes * by using another equals and hashcode visitor for those methods. */ -public class VisitorList implements List { +public class VisitorList implements List { protected List innerList; @@ -42,177 +42,182 @@ public class VisitorList implements List { /** * Pass the visitors to use for equals and hashcode. */ - public VisitorList( - GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { + public VisitorList(GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { this.hashcodeVisitor = hashcodeVisitor; this.equalsVisitor = equalsVisitor; innerList = new ArrayList<>(); } @Override - public boolean add(N elem) { + public boolean add(N elem) { return innerList.add(new EqualsHashcodeOverridingFacade(elem)); } @Override - public void add(int index, N elem) { + public void add(int index, N elem) { innerList.add(index, new EqualsHashcodeOverridingFacade(elem)); } @Override - public boolean addAll(Collection col) { + public boolean addAll(Collection col) { boolean modified = false; - for (N elem : col) if (add(elem)) modified = true; + for (N elem : col) if (add(elem)) + modified = true; return modified; } @Override - public boolean addAll(int index, Collection col) { - if (col.isEmpty()) return false; + public boolean addAll(int index, Collection col) { + if (col.isEmpty()) + return false; for (N elem : col) { - if (index == size()) add(elem); - else add(index, elem); + if (index == size()) + add(elem); + else + add(index, elem); index++; } return true; } @Override - public void clear() { + public void clear() { innerList.clear(); } @Override - public boolean contains(Object elem) { + public boolean contains(Object elem) { return innerList.contains(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public boolean containsAll(Collection col) { - for (Object elem : col) if (!contains(elem)) return false; + public boolean containsAll(Collection col) { + for (Object elem : col) if (!contains(elem)) + return false; return true; } @Override - public N get(int index) { + public N get(int index) { return innerList.get(index).overridden; } @Override - public int indexOf(Object elem) { + public int indexOf(Object elem) { return innerList.indexOf(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public boolean isEmpty() { + public boolean isEmpty() { return innerList.isEmpty(); } @Override - public Iterator iterator() { + public Iterator iterator() { return new Iterator() { final Iterator itr = innerList.iterator(); @Override - public boolean hasNext() { + public boolean hasNext() { return itr.hasNext(); } @Override - public N next() { + public N next() { return itr.next().overridden; } @Override - public void remove() { + public void remove() { itr.remove(); } }; } @Override - public int lastIndexOf(Object elem) { + public int lastIndexOf(Object elem) { return innerList.lastIndexOf(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public ListIterator listIterator() { + public ListIterator listIterator() { return listIterator(0); } @Override - public ListIterator listIterator(int index) { + public ListIterator listIterator(int index) { return new ListIterator() { final ListIterator itr = innerList.listIterator(index); @Override - public boolean hasNext() { + public boolean hasNext() { return itr.hasNext(); } @Override - public N next() { + public N next() { return itr.next().overridden; } @Override - public void remove() { + public void remove() { itr.remove(); } @Override - public void add(N elem) { + public void add(N elem) { itr.add(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public boolean hasPrevious() { + public boolean hasPrevious() { return itr.hasPrevious(); } @Override - public int nextIndex() { + public int nextIndex() { return itr.nextIndex(); } @Override - public N previous() { + public N previous() { return itr.previous().overridden; } @Override - public int previousIndex() { + public int previousIndex() { return itr.previousIndex(); } @Override - public void set(N elem) { + public void set(N elem) { itr.set(new EqualsHashcodeOverridingFacade((N) elem)); } }; } @Override - public boolean remove(Object elem) { + public boolean remove(Object elem) { return innerList.remove(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public N remove(int index) { + public N remove(int index) { return innerList.remove(index).overridden; } @Override - public boolean removeAll(Collection col) { + public boolean removeAll(Collection col) { boolean modified = false; - for (Object elem : col) if (remove(elem)) modified = true; + for (Object elem : col) if (remove(elem)) + modified = true; return modified; } @Override - public boolean retainAll(Collection col) { + public boolean retainAll(Collection col) { int oldSize = size(); clear(); addAll((Collection) col); @@ -220,17 +225,17 @@ public boolean retainAll(Collection col) { } @Override - public N set(int index, N elem) { + public N set(int index, N elem) { return innerList.set(index, new EqualsHashcodeOverridingFacade((N) elem)).overridden; } @Override - public int size() { + public int size() { return innerList.size(); } @Override - public List subList(int fromIndex, int toIndex) { + public List subList(int fromIndex, int toIndex) { return new VisitorList(hashcodeVisitor, equalsVisitor) { { @@ -240,25 +245,20 @@ public List subList(int fromIndex, int toIndex) { } @Override - public Object[] toArray() { - return innerList.stream() - .map(facade -> facade.overridden) - .collect(Collectors.toList()) - .toArray(); + public Object[] toArray() { + return innerList.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(); } @Override - public T[] toArray(T[] arr) { - return innerList.stream() - .map(facade -> facade.overridden) - .collect(Collectors.toList()) - .toArray(arr); + public T[] toArray(T[] arr) { + return innerList.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(arr); } @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder("["); - if (size() == 0) return sb.append("]").toString(); + if (size() == 0) + return sb.append("]").toString(); for (EqualsHashcodeOverridingFacade facade : innerList) { sb.append(facade.overridden.toString() + ", "); } @@ -274,12 +274,12 @@ private class EqualsHashcodeOverridingFacade implements Visitable { } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { throw new AssertionError(); } @Override - public     void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { throw new AssertionError(); } @@ -289,7 +289,7 @@ public final int hashCode() { } @Override - public boolean equals(final Object obj) { + public boolean equals(final Object obj) { if (obj == null || !(obj instanceof VisitorList.EqualsHashcodeOverridingFacade)) { return false; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java index 43a43dcbf5..f2db3abcd0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java @@ -34,7 +34,7 @@ * A map that overrides the equals and hashcode calculation of the added nodes * by using another equals and hashcode visitor for those methods. */ -public class VisitorMap implements Map { +public class VisitorMap implements Map { private final Map innerMap = new HashMap<>(); @@ -45,38 +45,38 @@ public class VisitorMap implements Map { /** * Pass the visitors to use for equals and hashcode. */ - public VisitorMap(GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { + public VisitorMap(GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { this.hashcodeVisitor = hashcodeVisitor; this.equalsVisitor = equalsVisitor; } @Override - public int size() { + public int size() { return innerMap.size(); } @Override - public boolean isEmpty() { + public boolean isEmpty() { return innerMap.isEmpty(); } @Override - public boolean containsKey(Object key) { + public boolean containsKey(Object key) { return innerMap.containsKey(new EqualsHashcodeOverridingFacade((N) key)); } @Override - public boolean containsValue(Object value) { + public boolean containsValue(Object value) { return innerMap.containsValue(value); } @Override - public V get(Object key) { + public V get(Object key) { return innerMap.get(new EqualsHashcodeOverridingFacade((N) key)); } @Override - public V put(N key, V value) { + public V put(N key, V value) { return innerMap.put(new EqualsHashcodeOverridingFacade(key), value); } @@ -89,12 +89,12 @@ private class EqualsHashcodeOverridingFacade implements Visitable { } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { throw new AssertionError(); } @Override - public void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { throw new AssertionError(); } @@ -104,7 +104,7 @@ public final int hashCode() { } @Override - public boolean equals(final Object obj) { + public boolean equals(final Object obj) { if (obj == null || !(obj instanceof VisitorMap.EqualsHashcodeOverridingFacade)) { return false; } @@ -113,34 +113,32 @@ public boolean equals(final Object obj) { } @Override - public V remove(Object key) { + public V remove(Object key) { return innerMap.remove(new EqualsHashcodeOverridingFacade((N) key)); } @Override - public void putAll(Map m) { + public void putAll(Map m) { m.forEach(this::put); } @Override - public void clear() { + public void clear() { innerMap.clear(); } @Override - public Set keySet() { + public Set keySet() { return innerMap.keySet().stream().map(k -> k.overridden).collect(Collectors.toSet()); } @Override - public Collection values() { + public Collection values() { return innerMap.values(); } @Override - public Set> entrySet() { - return innerMap.entrySet().stream() - .map(e -> new HashMap.SimpleEntry<>(e.getKey().overridden, e.getValue())) - .collect(Collectors.toSet()); + public Set> entrySet() { + return innerMap.entrySet().stream().map(e -> new HashMap.SimpleEntry<>(e.getKey().overridden, e.getValue())).collect(Collectors.toSet()); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java index 0b1a26440a..51f99c9bf9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java @@ -34,7 +34,7 @@ * A set that overrides the equals and hashcode calculation of the added nodes * by using another equals and hashcode visitor for those methods. */ -public class VisitorSet implements Set { +public class VisitorSet implements Set { private final Set innerSet = new HashSet<>(); @@ -45,81 +45,84 @@ public class VisitorSet implements Set { /** * Pass the visitors to use for equals and hashcode. */ - public VisitorSet(GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { + public VisitorSet(GenericVisitor hashcodeVisitor, GenericVisitor equalsVisitor) { this.hashcodeVisitor = hashcodeVisitor; this.equalsVisitor = equalsVisitor; } @Override - public boolean add(N elem) { + public boolean add(N elem) { return innerSet.add(new EqualsHashcodeOverridingFacade(elem)); } @Override - public boolean addAll(Collection col) { + public boolean addAll(Collection col) { boolean modified = false; - for (N elem : col) if (add(elem)) modified = true; + for (N elem : col) if (add(elem)) + modified = true; return modified; } @Override - public void clear() { + public void clear() { innerSet.clear(); } @Override - public boolean contains(Object elem) { + public boolean contains(Object elem) { return innerSet.contains(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public boolean containsAll(Collection col) { - for (Object elem : col) if (!contains(elem)) return false; + public boolean containsAll(Collection col) { + for (Object elem : col) if (!contains(elem)) + return false; return true; } @Override - public boolean isEmpty() { + public boolean isEmpty() { return innerSet.isEmpty(); } @Override - public Iterator iterator() { + public Iterator iterator() { return new Iterator() { final Iterator itr = innerSet.iterator(); @Override - public boolean hasNext() { + public boolean hasNext() { return itr.hasNext(); } @Override - public N next() { + public N next() { return itr.next().overridden; } @Override - public void remove() { + public void remove() { itr.remove(); } }; } @Override - public boolean remove(Object elem) { + public boolean remove(Object elem) { return innerSet.remove(new EqualsHashcodeOverridingFacade((N) elem)); } @Override - public boolean removeAll(Collection col) { + public boolean removeAll(Collection col) { boolean modified = false; - for (Object elem : col) if (remove(elem)) modified = true; + for (Object elem : col) if (remove(elem)) + modified = true; return modified; } @Override - public boolean retainAll(Collection col) { + public boolean retainAll(Collection col) { int oldSize = size(); clear(); addAll((Collection) col); @@ -127,30 +130,25 @@ public boolean retainAll(Collection col) { } @Override - public int size() { + public int size() { return innerSet.size(); } @Override - public Object[] toArray() { - return innerSet.stream() - .map(facade -> facade.overridden) - .collect(Collectors.toList()) - .toArray(); + public Object[] toArray() { + return innerSet.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(); } @Override - public T[] toArray(T[] arr) { - return innerSet.stream() - .map(facade -> facade.overridden) - .collect(Collectors.toList()) - .toArray(arr); + public T[] toArray(T[] arr) { + return innerSet.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(arr); } @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder("["); - if (size() == 0) return sb.append("]").toString(); + if (size() == 0) + return sb.append("]").toString(); for (EqualsHashcodeOverridingFacade facade : innerSet) { sb.append(facade.overridden.toString() + ","); } @@ -166,12 +164,12 @@ private class EqualsHashcodeOverridingFacade implements Visitable { } @Override - public R accept(GenericVisitor v, A arg) { + public R accept(GenericVisitor v, A arg) { throw new AssertionError(); } @Override - public void accept(VoidVisitor v, A arg) { + public void accept(VoidVisitor v, A arg) { throw new AssertionError(); } @@ -181,7 +179,7 @@ public final int hashCode() { } @Override - public boolean equals(final Object obj) { + public boolean equals(final Object obj) { if (obj == null || !(obj instanceof VisitorSet.EqualsHashcodeOverridingFacade)) { return false; } diff --git a/javaparser-core/src/main/javacc/java.jj b/javaparser-core/src/main/javacc/java.jj index dc597d0c8e..706d13e31b 100644 --- a/javaparser-core/src/main/javacc/java.jj +++ b/javaparser-core/src/main/javacc/java.jj @@ -417,7 +417,6 @@ TOKEN : { | | | -| | | | @@ -3344,46 +3343,43 @@ String Identifier(): // TODO: Explain why these keywords are explicitly flagged up as "included", and why they're not already covered by {@code }. // TODO: Explain how / where boolean and null literals are excluded. // Make sure the module info keywords don't interfere with normal Java parsing by matching them as normal identifiers. - | | | | | | | | | | + | | | | | | | | | // Make sure older Java versions parse - | | | | | | | - // An actual plain old identifier - - | | | | | + | | | | | | | // or a bunch of JML clause words - | | | | | - | | - | | | | | - | | | | | | - | | | | | - | | | | | - | | | | - | | | | - | | | | - | | | | - | | | | - | | | | - | | | | - | | | | | - | | | | | - | | | | | - | | | | - | | | | - | | | | - | | | | | - | | | | - | | | | | - | | | | | //| - | | | 
     |  | 
-       |  |  |  |  | 
-       |  |  |  |  | 
-       |  |  |  | 
-       |  |  |  | 
-       |  |  |  |  | 
-       |  |  |  |  | 
-       |  |  //| 
-       |  //|  |  |  |  | 
-       |  |  | 
+        |  |  |  |  | 
+        |  | 
+        |  |  |  |  | 
+        |  |  |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  |  |  //| 
+        |  |  | 
     |  | 
+        |  |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  | 
+        |  |  |  | 
+        |  |  |  |  | 
+        |  |  |  | 
+        |  |  //| 
+        |  //|  |  |  |  | 
+        |  |  | 
     ) { ret = token.image; setTokenKind(IDENTIFIER);}
     { return ret; }
 }
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java
index 372d6ba9eb..a7ae3875b6 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/JavaSymbolSolver.java
@@ -29,6 +29,7 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
+import com.github.javaparser.ast.jml.NodeWithJmlTags;
 import com.github.javaparser.ast.stmt.CatchClause;
 import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
 import com.github.javaparser.ast.type.Type;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
index 03478d037b..8680f17c0a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
@@ -27,5 +27,5 @@ public abstract class AbstractClassDeclarationTest extends AbstractTypeDeclarati
         implements ResolvedClassDeclarationTest, MethodResolutionCapabilityTest {
 
     @Override
-    public abstract AbstractClassDeclaration createValue();
+    public abstractClassDeclaration createValue();
 }
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
index 30bf53294b..4981d6e1dc 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
@@ -32,7 +32,7 @@ public abstract class AbstractTypeDeclarationTest extends AbstractSymbolResoluti
         implements ResolvedReferenceTypeDeclarationTest {
 
     @Override
-    public abstract AbstractTypeDeclaration createValue();
+    public abstractTypeDeclaration createValue();
 
     /**
      * Should say if an {@link AbstractTypeDeclaration} is functional interface.
diff --git a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/genetics/AbstractListChromosome.java b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/genetics/AbstractListChromosome.java
index c365978500..283a6efa38 100644
--- a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/genetics/AbstractListChromosome.java
+++ b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/genetics/AbstractListChromosome.java
@@ -103,7 +103,7 @@ public int getLength() {
      * @param chromosomeRepresentation the inner array representation of the new chromosome.
      * @return new instance extended from FixedLengthChromosome with the given arrayRepresentation
      */
-    public abstract AbstractListChromosome newFixedLengthChromosome(final List chromosomeRepresentation);
+    public abstractListChromosome newFixedLengthChromosome(final List chromosomeRepresentation);
 
     /**
      * {@inheritDoc}
diff --git a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java
index 3157c62ac5..d4fd36d8f1 100644
--- a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java
+++ b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java
@@ -191,7 +191,7 @@ public AbstractRegion(final Hyperplane[] hyperplanes, final double tolerance)
     /**
      * {@inheritDoc}
      */
-    public abstract AbstractRegion buildNew(BSPTree newTree);
+    public abstractRegion buildNew(BSPTree newTree);
 
     /**
      * Get the tolerance below which points are considered to belong to hyperplanes.
diff --git a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java
index 233d234cb2..f4be2df3ba 100644
--- a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java
+++ b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java
@@ -67,7 +67,7 @@ protected AbstractSubHyperplane(final Hyperplane hyperplane,
      * @param remaining remaining region of the hyperplane
      * @return a new sub-hyperplane
      */
-    protected abstract AbstractSubHyperplane buildNew(final Hyperplane hyper,
+    protected abstractSubHyperplane buildNew(final Hyperplane hyper,
                                                             final Region remaining);
 
     /**
diff --git a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/ode/sampling/AbstractFieldStepInterpolator.java b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/ode/sampling/AbstractFieldStepInterpolator.java
index a2baade229..84fb0ae04d 100644
--- a/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/ode/sampling/AbstractFieldStepInterpolator.java
+++ b/jmlparser-jml-tests/src/test/resources/fullexamples/openjml/test/gitbug481b/org/apache/commons/math3/ode/sampling/AbstractFieldStepInterpolator.java
@@ -122,7 +122,7 @@ public AbstractFieldStepInterpolator restrictStep(final FieldODEStateAndDeriv
      * @param newMapper              equations mapper for the all equations
      * @return a new instance
      */
-    protected abstract AbstractFieldStepInterpolator create(boolean newForward,
+    protected abstractFieldStepInterpolator create(boolean newForward,
                                                                FieldODEStateAndDerivative newGlobalPreviousState,
                                                                FieldODEStateAndDerivative newGlobalCurrentState,
                                                                FieldODEStateAndDerivative newSoftPreviousState,