diff options
Diffstat (limited to 'javaparser-core/src/main/java/com/github/javaparser/metamodel')
96 files changed, 182 insertions, 108 deletions
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 5ba67c3ab..501749909 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class AnnotationDeclarationMetaModel extends BaseNodeMetaModel { +public class AnnotationDeclarationMetaModel extends TypeDeclarationMetaModel { AnnotationDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.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 98e6706f0..7d6e2c99b 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class AnnotationExprMetaModel extends BaseNodeMetaModel { +public class AnnotationExprMetaModel extends ExpressionMetaModel { AnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.AnnotationExpr.class, "AnnotationExpr", "com.github.javaparser.ast.expr", true, false); } + protected AnnotationExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + 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 e18df867b..07c9ed74c 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class AnnotationMemberDeclarationMetaModel extends BaseNodeMetaModel { +public class AnnotationMemberDeclarationMetaModel extends BodyDeclarationMetaModel { AnnotationMemberDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.AnnotationMemberDeclaration.class, "AnnotationMemberDeclaration", "com.github.javaparser.ast.body", false, false); 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 025076a68..964089eb4 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ArrayAccessExprMetaModel extends BaseNodeMetaModel { +public class ArrayAccessExprMetaModel extends ExpressionMetaModel { ArrayAccessExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ArrayAccessExpr.class, "ArrayAccessExpr", "com.github.javaparser.ast.expr", false, false); 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 d36364c3e..4ee02b0f8 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ArrayCreationExprMetaModel extends BaseNodeMetaModel { +public class ArrayCreationExprMetaModel extends ExpressionMetaModel { ArrayCreationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ArrayCreationExpr.class, "ArrayCreationExpr", "com.github.javaparser.ast.expr", false, false); 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 0e088e6ba..e81396de2 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ArrayCreationLevelMetaModel extends BaseNodeMetaModel { +public class ArrayCreationLevelMetaModel extends NodeMetaModel { ArrayCreationLevelMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.ArrayCreationLevel.class, "ArrayCreationLevel", "com.github.javaparser.ast", false, false); 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 dad8f1b78..0ea4bd164 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ArrayInitializerExprMetaModel extends BaseNodeMetaModel { +public class ArrayInitializerExprMetaModel extends ExpressionMetaModel { ArrayInitializerExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ArrayInitializerExpr.class, "ArrayInitializerExpr", "com.github.javaparser.ast.expr", false, false); 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 2525becd1..9f0778b70 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ArrayTypeMetaModel extends BaseNodeMetaModel { +public class ArrayTypeMetaModel extends ReferenceTypeMetaModel { ArrayTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.ArrayType.class, "ArrayType", "com.github.javaparser.ast.type", false, false); 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 33cdbb38f..226dd99e4 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class AssertStmtMetaModel extends BaseNodeMetaModel { +public class AssertStmtMetaModel extends StatementMetaModel { AssertStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.AssertStmt.class, "AssertStmt", "com.github.javaparser.ast.stmt", false, false); 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 869e0b899..4f69faa13 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class AssignExprMetaModel extends BaseNodeMetaModel { +public class AssignExprMetaModel extends ExpressionMetaModel { AssignExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.AssignExpr.class, "AssignExpr", "com.github.javaparser.ast.expr", false, false); 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 dcbb5bfbe..e3012fa9d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class BinaryExprMetaModel extends BaseNodeMetaModel { +public class BinaryExprMetaModel extends ExpressionMetaModel { BinaryExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.BinaryExpr.class, "BinaryExpr", "com.github.javaparser.ast.expr", false, false); 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 f4ab7ca2b..526057219 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class BlockCommentMetaModel extends BaseNodeMetaModel { +public class BlockCommentMetaModel extends CommentMetaModel { BlockCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.comments.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 de33a901f..8323609e5 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class BlockStmtMetaModel extends BaseNodeMetaModel { +public class BlockStmtMetaModel extends StatementMetaModel { BlockStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.BlockStmt.class, "BlockStmt", "com.github.javaparser.ast.stmt", false, false); 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 d1b97998a..5ca038f97 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class BodyDeclarationMetaModel extends BaseNodeMetaModel { +public class BodyDeclarationMetaModel extends NodeMetaModel { BodyDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.BodyDeclaration.class, "BodyDeclaration", "com.github.javaparser.ast.body", true, true); } + protected BodyDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + 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 4255fa494..4ecb865b5 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class BooleanLiteralExprMetaModel extends BaseNodeMetaModel { +public class BooleanLiteralExprMetaModel extends LiteralExprMetaModel { BooleanLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.BooleanLiteralExpr.class, "BooleanLiteralExpr", "com.github.javaparser.ast.expr", false, false); 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 006f48cab..32449dd21 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class BreakStmtMetaModel extends BaseNodeMetaModel { +public class BreakStmtMetaModel extends StatementMetaModel { BreakStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.BreakStmt.class, "BreakStmt", "com.github.javaparser.ast.stmt", false, false); 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 0b6dbd756..90041cf50 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class CallableDeclarationMetaModel extends BaseNodeMetaModel { +public class CallableDeclarationMetaModel extends BodyDeclarationMetaModel { CallableDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.CallableDeclaration.class, "CallableDeclaration", "com.github.javaparser.ast.body", true, true); } + protected CallableDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + public PropertyMetaModel modifiersPropertyMetaModel; public PropertyMetaModel namePropertyMetaModel; 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 2bc98bb34..750394a31 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class CastExprMetaModel extends BaseNodeMetaModel { +public class CastExprMetaModel extends ExpressionMetaModel { CastExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.CastExpr.class, "CastExpr", "com.github.javaparser.ast.expr", false, false); 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 f2932ba49..8da6415a5 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class CatchClauseMetaModel extends BaseNodeMetaModel { +public class CatchClauseMetaModel extends NodeMetaModel { CatchClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.CatchClause.class, "CatchClause", "com.github.javaparser.ast.stmt", false, false); 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 4d6977a6c..c5a17acad 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class CharLiteralExprMetaModel extends BaseNodeMetaModel { +public class CharLiteralExprMetaModel extends LiteralStringValueExprMetaModel { CharLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.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 3043245b3..9bd60e9a3 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ClassExprMetaModel extends BaseNodeMetaModel { +public class ClassExprMetaModel extends ExpressionMetaModel { ClassExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ClassExpr.class, "ClassExpr", "com.github.javaparser.ast.expr", false, false); 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 4667e3745..2d4c5b846 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ClassOrInterfaceDeclarationMetaModel extends BaseNodeMetaModel { +public class ClassOrInterfaceDeclarationMetaModel extends TypeDeclarationMetaModel { ClassOrInterfaceDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class, "ClassOrInterfaceDeclaration", "com.github.javaparser.ast.body", false, false); 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 7fe6bdf5e..d7b6b2c9b 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ClassOrInterfaceTypeMetaModel extends BaseNodeMetaModel { +public class ClassOrInterfaceTypeMetaModel extends ReferenceTypeMetaModel { ClassOrInterfaceTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.ClassOrInterfaceType.class, "ClassOrInterfaceType", "com.github.javaparser.ast.type", false, false); 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 6c6c851e2..88d5e52bf 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class CommentMetaModel extends BaseNodeMetaModel { +public class CommentMetaModel extends NodeMetaModel { CommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.comments.Comment.class, "Comment", "com.github.javaparser.ast.comments", true, false); } + protected CommentMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + public PropertyMetaModel contentPropertyMetaModel; } 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 612930248..f08c9be5a 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class CompilationUnitMetaModel extends BaseNodeMetaModel { +public class CompilationUnitMetaModel extends NodeMetaModel { CompilationUnitMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.CompilationUnit.class, "CompilationUnit", "com.github.javaparser.ast", false, false); 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 5b5f73a44..84a84a154 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ConditionalExprMetaModel extends BaseNodeMetaModel { +public class ConditionalExprMetaModel extends ExpressionMetaModel { ConditionalExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ConditionalExpr.class, "ConditionalExpr", "com.github.javaparser.ast.expr", false, false); 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 cc1ca2de7..9c787b1ec 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ConstructorDeclarationMetaModel extends BaseNodeMetaModel { +public class ConstructorDeclarationMetaModel extends CallableDeclarationMetaModel { ConstructorDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.ConstructorDeclaration.class, "ConstructorDeclaration", "com.github.javaparser.ast.body", false, false); 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 c0672a702..b10818fad 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ContinueStmtMetaModel extends BaseNodeMetaModel { +public class ContinueStmtMetaModel extends StatementMetaModel { ContinueStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ContinueStmt.class, "ContinueStmt", "com.github.javaparser.ast.stmt", false, false); 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 9a93a4ad4..ae095a8fc 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class DoStmtMetaModel extends BaseNodeMetaModel { +public class DoStmtMetaModel extends StatementMetaModel { DoStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.DoStmt.class, "DoStmt", "com.github.javaparser.ast.stmt", false, false); 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 7db34c6c7..8498855a0 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class DoubleLiteralExprMetaModel extends BaseNodeMetaModel { +public class DoubleLiteralExprMetaModel extends LiteralStringValueExprMetaModel { DoubleLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.DoubleLiteralExpr.class, "DoubleLiteralExpr", "com.github.javaparser.ast.expr", false, false); diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyMemberDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyMemberDeclarationMetaModel.java index 5dbeaa1d2..fabb647f8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyMemberDeclarationMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyMemberDeclarationMetaModel.java @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class EmptyMemberDeclarationMetaModel extends BaseNodeMetaModel { +public class EmptyMemberDeclarationMetaModel extends BodyDeclarationMetaModel { EmptyMemberDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.EmptyMemberDeclaration.class, "EmptyMemberDeclaration", "com.github.javaparser.ast.body", 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 db2e3cf06..4ae40f50a 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class EmptyStmtMetaModel extends BaseNodeMetaModel { +public class EmptyStmtMetaModel extends StatementMetaModel { EmptyStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.EmptyStmt.class, "EmptyStmt", "com.github.javaparser.ast.stmt", false, false); 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 18bee78f7..26c5bd9a1 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class EnclosedExprMetaModel extends BaseNodeMetaModel { +public class EnclosedExprMetaModel extends ExpressionMetaModel { EnclosedExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.EnclosedExpr.class, "EnclosedExpr", "com.github.javaparser.ast.expr", false, false); 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 c8c621731..f206dfa36 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class EnumConstantDeclarationMetaModel extends BaseNodeMetaModel { +public class EnumConstantDeclarationMetaModel extends BodyDeclarationMetaModel { EnumConstantDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.EnumConstantDeclaration.class, "EnumConstantDeclaration", "com.github.javaparser.ast.body", false, false); 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 37d83a779..841493fdb 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class EnumDeclarationMetaModel extends BaseNodeMetaModel { +public class EnumDeclarationMetaModel extends TypeDeclarationMetaModel { EnumDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.EnumDeclaration.class, "EnumDeclaration", "com.github.javaparser.ast.body", false, false); 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 e0c59b0bc..ec0acdb1e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ExplicitConstructorInvocationStmtMetaModel extends BaseNodeMetaModel { +public class ExplicitConstructorInvocationStmtMetaModel extends StatementMetaModel { ExplicitConstructorInvocationStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt.class, "ExplicitConstructorInvocationStmt", "com.github.javaparser.ast.stmt", false, false); 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 d7e8d2e11..b904c3e71 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 @@ -1,11 +1,16 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class ExpressionMetaModel extends BaseNodeMetaModel { +public class ExpressionMetaModel extends NodeMetaModel { ExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.Expression.class, "Expression", "com.github.javaparser.ast.expr", true, false); } + + protected ExpressionMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> 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 4ceefd433..c676861df 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ExpressionStmtMetaModel extends BaseNodeMetaModel { +public class ExpressionStmtMetaModel extends StatementMetaModel { ExpressionStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ExpressionStmt.class, "ExpressionStmt", "com.github.javaparser.ast.stmt", false, false); 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 e45ab298b..8804cba49 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class FieldAccessExprMetaModel extends BaseNodeMetaModel { +public class FieldAccessExprMetaModel extends ExpressionMetaModel { FieldAccessExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.FieldAccessExpr.class, "FieldAccessExpr", "com.github.javaparser.ast.expr", false, false); 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 2449a8ae7..f16492a45 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class FieldDeclarationMetaModel extends BaseNodeMetaModel { +public class FieldDeclarationMetaModel extends BodyDeclarationMetaModel { FieldDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.FieldDeclaration.class, "FieldDeclaration", "com.github.javaparser.ast.body", false, false); 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 6cdc9a8ce..3b97972be 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ForStmtMetaModel extends BaseNodeMetaModel { +public class ForStmtMetaModel extends StatementMetaModel { ForStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ForStmt.class, "ForStmt", "com.github.javaparser.ast.stmt", false, false); 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 b2d1b86cd..b22901e1f 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ForeachStmtMetaModel extends BaseNodeMetaModel { +public class ForeachStmtMetaModel extends StatementMetaModel { ForeachStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ForeachStmt.class, "ForeachStmt", "com.github.javaparser.ast.stmt", false, false); 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 c7b0f069d..7c237974d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class IfStmtMetaModel extends BaseNodeMetaModel { +public class IfStmtMetaModel extends StatementMetaModel { IfStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.IfStmt.class, "IfStmt", "com.github.javaparser.ast.stmt", false, false); 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 5810dcf9a..68ed1bb89 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ImportDeclarationMetaModel extends BaseNodeMetaModel { +public class ImportDeclarationMetaModel extends NodeMetaModel { ImportDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.ImportDeclaration.class, "ImportDeclaration", "com.github.javaparser.ast", false, false); 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 cc8f7fcbf..376cb93f3 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class InitializerDeclarationMetaModel extends BaseNodeMetaModel { +public class InitializerDeclarationMetaModel extends BodyDeclarationMetaModel { InitializerDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.InitializerDeclaration.class, "InitializerDeclaration", "com.github.javaparser.ast.body", false, false); 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 61efee7de..9ce618b7d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class InstanceOfExprMetaModel extends BaseNodeMetaModel { +public class InstanceOfExprMetaModel extends ExpressionMetaModel { InstanceOfExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.InstanceOfExpr.class, "InstanceOfExpr", "com.github.javaparser.ast.expr", false, false); 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 1a72b33f8..9debcdd70 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class IntegerLiteralExprMetaModel extends BaseNodeMetaModel { +public class IntegerLiteralExprMetaModel extends LiteralStringValueExprMetaModel { IntegerLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.IntegerLiteralExpr.class, "IntegerLiteralExpr", "com.github.javaparser.ast.expr", false, false); 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 005f0d289..ae1ef410b 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class IntersectionTypeMetaModel extends BaseNodeMetaModel { +public class IntersectionTypeMetaModel extends TypeMetaModel { IntersectionTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.IntersectionType.class, "IntersectionType", "com.github.javaparser.ast.type", false, false); 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 6faaffdb9..bc649d8ea 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 @@ -16,7 +16,7 @@ public final class JavaParserMetaModel { private static final List<BaseNodeMetaModel> nodeMetaModels = new ArrayList<>(); private static void initializeConstructorParameters() { - stringLiteralExprMetaModel.getConstructorParameters().add(stringLiteralExprMetaModel.valuePropertyMetaModel); + stringLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel); arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel); compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel); @@ -98,23 +98,23 @@ public final class JavaParserMetaModel { booleanLiteralExprMetaModel.getConstructorParameters().add(booleanLiteralExprMetaModel.valuePropertyMetaModel); castExprMetaModel.getConstructorParameters().add(castExprMetaModel.typePropertyMetaModel); castExprMetaModel.getConstructorParameters().add(castExprMetaModel.expressionPropertyMetaModel); - charLiteralExprMetaModel.getConstructorParameters().add(stringLiteralExprMetaModel.valuePropertyMetaModel); + charLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); classExprMetaModel.getConstructorParameters().add(classExprMetaModel.typePropertyMetaModel); conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.conditionPropertyMetaModel); conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.thenExprPropertyMetaModel); conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.elseExprPropertyMetaModel); - doubleLiteralExprMetaModel.getConstructorParameters().add(stringLiteralExprMetaModel.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.namePropertyMetaModel); instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.expressionPropertyMetaModel); instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.typePropertyMetaModel); - integerLiteralExprMetaModel.getConstructorParameters().add(stringLiteralExprMetaModel.valuePropertyMetaModel); + integerLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.parametersPropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.bodyPropertyMetaModel); lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel); - longLiteralExprMetaModel.getConstructorParameters().add(stringLiteralExprMetaModel.valuePropertyMetaModel); + longLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel); markerAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel); memberValuePairMetaModel.getConstructorParameters().add(memberValuePairMetaModel.namePropertyMetaModel); memberValuePairMetaModel.getConstructorParameters().add(memberValuePairMetaModel.valuePropertyMetaModel); @@ -263,6 +263,7 @@ public final class JavaParserMetaModel { nodeMetaModels.add(lambdaExprMetaModel); nodeMetaModels.add(lineCommentMetaModel); nodeMetaModels.add(literalExprMetaModel); + nodeMetaModels.add(literalStringValueExprMetaModel); nodeMetaModels.add(localClassDeclarationStmtMetaModel); nodeMetaModels.add(longLiteralExprMetaModel); nodeMetaModels.add(markerAnnotationExprMetaModel); @@ -331,8 +332,8 @@ public final class JavaParserMetaModel { 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, false); typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.namePropertyMetaModel); - stringLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(stringLiteralExprMetaModel, "value", java.lang.String.class, Optional.empty(), false, false, false, false, false); - stringLiteralExprMetaModel.getDeclaredPropertyMetaModels().add(stringLiteralExprMetaModel.valuePropertyMetaModel); + literalStringValueExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(literalStringValueExprMetaModel, "value", java.lang.String.class, Optional.empty(), false, false, false, false, false); + literalStringValueExprMetaModel.getDeclaredPropertyMetaModels().add(literalStringValueExprMetaModel.valuePropertyMetaModel); arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false, 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, false); @@ -656,11 +657,13 @@ public final class JavaParserMetaModel { public static final TypeDeclarationMetaModel typeDeclarationMetaModel = new TypeDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel)); + public static final ReferenceTypeMetaModel referenceTypeMetaModel = new ReferenceTypeMetaModel(Optional.of(typeMetaModel)); + public static final LiteralExprMetaModel literalExprMetaModel = new LiteralExprMetaModel(Optional.of(expressionMetaModel)); - public static final ReferenceTypeMetaModel referenceTypeMetaModel = new ReferenceTypeMetaModel(Optional.of(typeMetaModel)); + public static final LiteralStringValueExprMetaModel literalStringValueExprMetaModel = new LiteralStringValueExprMetaModel(Optional.of(literalExprMetaModel)); - public static final StringLiteralExprMetaModel stringLiteralExprMetaModel = new StringLiteralExprMetaModel(Optional.of(literalExprMetaModel)); + public static final StringLiteralExprMetaModel stringLiteralExprMetaModel = new StringLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); public static final ArrayCreationLevelMetaModel arrayCreationLevelMetaModel = new ArrayCreationLevelMetaModel(Optional.of(nodeMetaModel)); @@ -714,13 +717,13 @@ public final class JavaParserMetaModel { public static final CastExprMetaModel castExprMetaModel = new CastExprMetaModel(Optional.of(expressionMetaModel)); - public static final CharLiteralExprMetaModel charLiteralExprMetaModel = new CharLiteralExprMetaModel(Optional.of(stringLiteralExprMetaModel)); + public static final CharLiteralExprMetaModel charLiteralExprMetaModel = new CharLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); public static final ClassExprMetaModel classExprMetaModel = new ClassExprMetaModel(Optional.of(expressionMetaModel)); public static final ConditionalExprMetaModel conditionalExprMetaModel = new ConditionalExprMetaModel(Optional.of(expressionMetaModel)); - public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel = new DoubleLiteralExprMetaModel(Optional.of(stringLiteralExprMetaModel)); + public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel = new DoubleLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); public static final EnclosedExprMetaModel enclosedExprMetaModel = new EnclosedExprMetaModel(Optional.of(expressionMetaModel)); @@ -728,11 +731,11 @@ public final class JavaParserMetaModel { public static final InstanceOfExprMetaModel instanceOfExprMetaModel = new InstanceOfExprMetaModel(Optional.of(expressionMetaModel)); - public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel = new IntegerLiteralExprMetaModel(Optional.of(stringLiteralExprMetaModel)); + public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel = new IntegerLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); public static final LambdaExprMetaModel lambdaExprMetaModel = new LambdaExprMetaModel(Optional.of(expressionMetaModel)); - public static final LongLiteralExprMetaModel longLiteralExprMetaModel = new LongLiteralExprMetaModel(Optional.of(stringLiteralExprMetaModel)); + public static final LongLiteralExprMetaModel longLiteralExprMetaModel = new LongLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel)); public static final MarkerAnnotationExprMetaModel markerAnnotationExprMetaModel = new MarkerAnnotationExprMetaModel(Optional.of(annotationExprMetaModel)); 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 f493cecf2..20cca08c4 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class JavadocCommentMetaModel extends BaseNodeMetaModel { +public class JavadocCommentMetaModel extends CommentMetaModel { JavadocCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.comments.JavadocComment.class, "JavadocComment", "com.github.javaparser.ast.comments", false, false); 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 6e475111b..a59716044 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class LabeledStmtMetaModel extends BaseNodeMetaModel { +public class LabeledStmtMetaModel extends StatementMetaModel { LabeledStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.LabeledStmt.class, "LabeledStmt", "com.github.javaparser.ast.stmt", false, false); 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 1bbaedefd..8770b740d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class LambdaExprMetaModel extends BaseNodeMetaModel { +public class LambdaExprMetaModel extends ExpressionMetaModel { LambdaExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.LambdaExpr.class, "LambdaExpr", "com.github.javaparser.ast.expr", false, false); 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 7dffb3ada..c2854b9c3 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class LineCommentMetaModel extends BaseNodeMetaModel { +public class LineCommentMetaModel extends CommentMetaModel { LineCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.comments.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 ed84c7036..3535fd659 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 @@ -1,11 +1,16 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class LiteralExprMetaModel extends BaseNodeMetaModel { +public class LiteralExprMetaModel extends ExpressionMetaModel { LiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.LiteralExpr.class, "LiteralExpr", "com.github.javaparser.ast.expr", true, false); } + + protected LiteralExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> 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 new file mode 100644 index 000000000..49f293e09 --- /dev/null +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java @@ -0,0 +1,18 @@ +package com.github.javaparser.metamodel; + +import java.util.Optional; +import com.github.javaparser.ast.Node; + +public class LiteralStringValueExprMetaModel extends LiteralExprMetaModel { + + LiteralStringValueExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { + super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.LiteralStringValueExpr.class, "LiteralStringValueExpr", "com.github.javaparser.ast.expr", true, false); + } + + protected LiteralStringValueExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + + 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 4d53ced30..debbed0c1 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class LocalClassDeclarationStmtMetaModel extends BaseNodeMetaModel { +public class LocalClassDeclarationStmtMetaModel extends StatementMetaModel { LocalClassDeclarationStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.LocalClassDeclarationStmt.class, "LocalClassDeclarationStmt", "com.github.javaparser.ast.stmt", false, false); 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 cf4f581e0..522a8e665 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class LongLiteralExprMetaModel extends BaseNodeMetaModel { +public class LongLiteralExprMetaModel extends LiteralStringValueExprMetaModel { LongLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.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 e3ea63d0e..08b13d3e0 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class MarkerAnnotationExprMetaModel extends BaseNodeMetaModel { +public class MarkerAnnotationExprMetaModel extends AnnotationExprMetaModel { MarkerAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.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 d37de71e3..e56c30faa 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class MemberValuePairMetaModel extends BaseNodeMetaModel { +public class MemberValuePairMetaModel extends NodeMetaModel { MemberValuePairMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.MemberValuePair.class, "MemberValuePair", "com.github.javaparser.ast.expr", false, false); 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 039cfa2ae..b4709fe8a 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class MethodCallExprMetaModel extends BaseNodeMetaModel { +public class MethodCallExprMetaModel extends ExpressionMetaModel { MethodCallExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.MethodCallExpr.class, "MethodCallExpr", "com.github.javaparser.ast.expr", false, false); 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 3e6714498..4026cf79e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class MethodDeclarationMetaModel extends BaseNodeMetaModel { +public class MethodDeclarationMetaModel extends CallableDeclarationMetaModel { MethodDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.MethodDeclaration.class, "MethodDeclaration", "com.github.javaparser.ast.body", false, false); 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 d3645b2dc..370e9504d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class MethodReferenceExprMetaModel extends BaseNodeMetaModel { +public class MethodReferenceExprMetaModel extends ExpressionMetaModel { MethodReferenceExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.MethodReferenceExpr.class, "MethodReferenceExpr", "com.github.javaparser.ast.expr", false, false); 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 0b89521c3..3a46b1e7d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class NameExprMetaModel extends BaseNodeMetaModel { +public class NameExprMetaModel extends ExpressionMetaModel { NameExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.NameExpr.class, "NameExpr", "com.github.javaparser.ast.expr", false, false); 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 5e4d1369c..ed8f8fea3 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class NameMetaModel extends BaseNodeMetaModel { +public class NameMetaModel extends NodeMetaModel { NameMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.Name.class, "Name", "com.github.javaparser.ast.expr", false, false); 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 011efedcd..8c7f8d969 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 @@ -1,6 +1,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; public class NodeMetaModel extends BaseNodeMetaModel { @@ -8,6 +9,10 @@ public class NodeMetaModel extends BaseNodeMetaModel { super(superBaseNodeMetaModel, com.github.javaparser.ast.Node.class, "Node", "com.github.javaparser.ast", true, false); } + protected NodeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + public PropertyMetaModel commentPropertyMetaModel; } 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 72642df83..7615cf8ac 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class NormalAnnotationExprMetaModel extends BaseNodeMetaModel { +public class NormalAnnotationExprMetaModel extends AnnotationExprMetaModel { NormalAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.NormalAnnotationExpr.class, "NormalAnnotationExpr", "com.github.javaparser.ast.expr", false, false); 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 667183cf0..cb1771694 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class NullLiteralExprMetaModel extends BaseNodeMetaModel { +public class NullLiteralExprMetaModel extends LiteralExprMetaModel { NullLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.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 73c41f791..b53f8fbfd 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ObjectCreationExprMetaModel extends BaseNodeMetaModel { +public class ObjectCreationExprMetaModel extends ExpressionMetaModel { ObjectCreationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ObjectCreationExpr.class, "ObjectCreationExpr", "com.github.javaparser.ast.expr", false, false); 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 c1d398d6a..62dfa94a7 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class PackageDeclarationMetaModel extends BaseNodeMetaModel { +public class PackageDeclarationMetaModel extends NodeMetaModel { PackageDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.PackageDeclaration.class, "PackageDeclaration", "com.github.javaparser.ast", false, false); 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 1d8a41c54..0e39cfb32 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ParameterMetaModel extends BaseNodeMetaModel { +public class ParameterMetaModel extends NodeMetaModel { ParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.Parameter.class, "Parameter", "com.github.javaparser.ast.body", false, false); 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 30fbfebac..416e70371 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class PrimitiveTypeMetaModel extends BaseNodeMetaModel { +public class PrimitiveTypeMetaModel extends TypeMetaModel { PrimitiveTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.PrimitiveType.class, "PrimitiveType", "com.github.javaparser.ast.type", false, false); 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 8b5e998f9..ca094fb0c 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 @@ -1,11 +1,16 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class ReferenceTypeMetaModel extends BaseNodeMetaModel { +public class ReferenceTypeMetaModel extends TypeMetaModel { ReferenceTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.ReferenceType.class, "ReferenceType", "com.github.javaparser.ast.type", true, true); } + + protected ReferenceTypeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> 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 84eafc377..a1082e6d1 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ReturnStmtMetaModel extends BaseNodeMetaModel { +public class ReturnStmtMetaModel extends StatementMetaModel { ReturnStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ReturnStmt.class, "ReturnStmt", "com.github.javaparser.ast.stmt", false, false); 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 7ea2564e1..10d558528 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SimpleNameMetaModel extends BaseNodeMetaModel { +public class SimpleNameMetaModel extends NodeMetaModel { SimpleNameMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.SimpleName.class, "SimpleName", "com.github.javaparser.ast.expr", false, false); 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 f7380313a..93067df7c 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SingleMemberAnnotationExprMetaModel extends BaseNodeMetaModel { +public class SingleMemberAnnotationExprMetaModel extends AnnotationExprMetaModel { SingleMemberAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.SingleMemberAnnotationExpr.class, "SingleMemberAnnotationExpr", "com.github.javaparser.ast.expr", false, false); 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 f3602e743..51ef29625 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 @@ -1,11 +1,16 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class StatementMetaModel extends BaseNodeMetaModel { +public class StatementMetaModel extends NodeMetaModel { StatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.Statement.class, "Statement", "com.github.javaparser.ast.stmt", true, false); } + + protected StatementMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> 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 e0d0f5afd..17692cc66 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 @@ -2,12 +2,10 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class StringLiteralExprMetaModel extends BaseNodeMetaModel { +public class StringLiteralExprMetaModel extends LiteralStringValueExprMetaModel { StringLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.StringLiteralExpr.class, "StringLiteralExpr", "com.github.javaparser.ast.expr", false, false); } - - public PropertyMetaModel valuePropertyMetaModel; } 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 b991ac79f..f1b3bc85e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SuperExprMetaModel extends BaseNodeMetaModel { +public class SuperExprMetaModel extends ExpressionMetaModel { SuperExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.SuperExpr.class, "SuperExpr", "com.github.javaparser.ast.expr", false, false); diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryStmtMetaModel.java index 5cc31b10a..df18a80f3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryStmtMetaModel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryStmtMetaModel.java @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SwitchEntryStmtMetaModel extends BaseNodeMetaModel { +public class SwitchEntryStmtMetaModel extends StatementMetaModel { SwitchEntryStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.SwitchEntryStmt.class, "SwitchEntryStmt", "com.github.javaparser.ast.stmt", false, false); 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 f4012e727..d0d97310e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SwitchStmtMetaModel extends BaseNodeMetaModel { +public class SwitchStmtMetaModel extends StatementMetaModel { SwitchStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.SwitchStmt.class, "SwitchStmt", "com.github.javaparser.ast.stmt", false, false); 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 3e1d92c54..d870f01e0 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class SynchronizedStmtMetaModel extends BaseNodeMetaModel { +public class SynchronizedStmtMetaModel extends StatementMetaModel { SynchronizedStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.SynchronizedStmt.class, "SynchronizedStmt", "com.github.javaparser.ast.stmt", 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 3e8841755..ad10e9432 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ThisExprMetaModel extends BaseNodeMetaModel { +public class ThisExprMetaModel extends ExpressionMetaModel { ThisExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.ThisExpr.class, "ThisExpr", "com.github.javaparser.ast.expr", false, false); 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 c7ce7f8a0..82656086f 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class ThrowStmtMetaModel extends BaseNodeMetaModel { +public class ThrowStmtMetaModel extends StatementMetaModel { ThrowStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.ThrowStmt.class, "ThrowStmt", "com.github.javaparser.ast.stmt", false, false); 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 6bd9582b4..d2a31428e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class TryStmtMetaModel extends BaseNodeMetaModel { +public class TryStmtMetaModel extends StatementMetaModel { TryStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.TryStmt.class, "TryStmt", "com.github.javaparser.ast.stmt", false, false); 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 792d59cc6..42adfe3fb 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class TypeDeclarationMetaModel extends BaseNodeMetaModel { +public class TypeDeclarationMetaModel extends BodyDeclarationMetaModel { TypeDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.TypeDeclaration.class, "TypeDeclaration", "com.github.javaparser.ast.body", true, true); } + protected TypeDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + public PropertyMetaModel membersPropertyMetaModel; public PropertyMetaModel modifiersPropertyMetaModel; 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 bf3bc470e..400da1a84 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class TypeExprMetaModel extends BaseNodeMetaModel { +public class TypeExprMetaModel extends ExpressionMetaModel { TypeExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.TypeExpr.class, "TypeExpr", "com.github.javaparser.ast.expr", false, false); 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 77d08c78f..656b85728 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 @@ -1,13 +1,18 @@ package com.github.javaparser.metamodel; import java.util.Optional; +import com.github.javaparser.ast.Node; -public class TypeMetaModel extends BaseNodeMetaModel { +public class TypeMetaModel extends NodeMetaModel { TypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.Type.class, "Type", "com.github.javaparser.ast.type", true, false); } + protected TypeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) { + super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard); + } + 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 9486829e3..9ba170723 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class TypeParameterMetaModel extends BaseNodeMetaModel { +public class TypeParameterMetaModel extends ReferenceTypeMetaModel { TypeParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.TypeParameter.class, "TypeParameter", "com.github.javaparser.ast.type", false, false); 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 a1cdd1159..5ab5fa28d 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class UnaryExprMetaModel extends BaseNodeMetaModel { +public class UnaryExprMetaModel extends ExpressionMetaModel { UnaryExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.UnaryExpr.class, "UnaryExpr", "com.github.javaparser.ast.expr", false, false); 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 7a0f2c57b..e1fd9352c 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class UnionTypeMetaModel extends BaseNodeMetaModel { +public class UnionTypeMetaModel extends TypeMetaModel { UnionTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.UnionType.class, "UnionType", "com.github.javaparser.ast.type", false, false); 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 b939d4a95..dbbe258b1 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class UnknownTypeMetaModel extends BaseNodeMetaModel { +public class UnknownTypeMetaModel extends TypeMetaModel { UnknownTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.UnknownType.class, "UnknownType", "com.github.javaparser.ast.type", false, false); 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 bf00d7cfa..b2f6b34eb 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class VariableDeclarationExprMetaModel extends BaseNodeMetaModel { +public class VariableDeclarationExprMetaModel extends ExpressionMetaModel { VariableDeclarationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.expr.VariableDeclarationExpr.class, "VariableDeclarationExpr", "com.github.javaparser.ast.expr", false, false); 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 77935c613..ba638e10e 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class VariableDeclaratorMetaModel extends BaseNodeMetaModel { +public class VariableDeclaratorMetaModel extends NodeMetaModel { VariableDeclaratorMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.body.VariableDeclarator.class, "VariableDeclarator", "com.github.javaparser.ast.body", false, false); 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 3078843d9..c732f6d71 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class VoidTypeMetaModel extends BaseNodeMetaModel { +public class VoidTypeMetaModel extends TypeMetaModel { VoidTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.VoidType.class, "VoidType", "com.github.javaparser.ast.type", false, false); 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 a1ee176e6..4e392b1ca 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class WhileStmtMetaModel extends BaseNodeMetaModel { +public class WhileStmtMetaModel extends StatementMetaModel { WhileStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.WhileStmt.class, "WhileStmt", "com.github.javaparser.ast.stmt", false, false); 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 36070f161..7a630df88 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 @@ -2,7 +2,7 @@ package com.github.javaparser.metamodel; import java.util.Optional; -public class WildcardTypeMetaModel extends BaseNodeMetaModel { +public class WildcardTypeMetaModel extends TypeMetaModel { WildcardTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) { super(superBaseNodeMetaModel, com.github.javaparser.ast.type.WildcardType.class, "WildcardType", "com.github.javaparser.ast.type", false, false); |