minor tweaks

techrev · May 31, 2020 · 7fb276d · 7fb276d
1 parent 702a38e
commit 7fb276d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/...generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java b/...generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java
@@ -46,11 +46,12 @@
 public class MetaModelGenerator extends AbstractGenerator {
 
     static final String BASE_NODE_META_MODEL = "BaseNodeMetaModel";
+    static final String METAMODEL_PACKAGE = "com.github.javaparser.metamodel";
 
     /**
      * Note that order of this list is manually set and maintained.
      */
-    private static List<Class<? extends Node>> ALL_NODE_CLASSES = new ArrayList<Class<? extends Node>>() {{
+    private static final List<Class<? extends Node>> ALL_NODE_CLASSES = new ArrayList<Class<? extends Node>>() {{
         /* Base classes go first, so we don't have to do any sorting to make sure
          generated classes can refer to their base generated classes without
          being afraid those are not initialized yet. */
@@ -98,10 +99,10 @@ public class MetaModelGenerator extends AbstractGenerator {
         add(com.github.javaparser.ast.body.ReceiverParameter.class);
         add(com.github.javaparser.ast.body.VariableDeclarator.class);
 
-        add(com.github.javaparser.ast.comments.Comment.class); // Base of other comment types
+        add(com.github.javaparser.ast.comments.Comment.class); // First, as it is the base of other comment types
         add(com.github.javaparser.ast.comments.BlockComment.class);
-        add(com.github.javaparser.ast.comments.LineComment.class);
         add(com.github.javaparser.ast.comments.JavadocComment.class);
+        add(com.github.javaparser.ast.comments.LineComment.class);
 
         add(com.github.javaparser.ast.expr.ArrayAccessExpr.class);
         add(com.github.javaparser.ast.expr.ArrayCreationExpr.class);
@@ -129,15 +130,15 @@ public class MetaModelGenerator extends AbstractGenerator {
         add(com.github.javaparser.ast.expr.NormalAnnotationExpr.class);
         add(com.github.javaparser.ast.expr.NullLiteralExpr.class);
         add(com.github.javaparser.ast.expr.ObjectCreationExpr.class);
-        add(com.github.javaparser.ast.expr.SimpleName.class);
         add(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr.class);
+        add(com.github.javaparser.ast.expr.SimpleName.class);
         add(com.github.javaparser.ast.expr.SuperExpr.class);
+        add(com.github.javaparser.ast.expr.SwitchExpr.class);
         add(com.github.javaparser.ast.expr.TextBlockLiteralExpr.class);
         add(com.github.javaparser.ast.expr.ThisExpr.class);
         add(com.github.javaparser.ast.expr.TypeExpr.class);
         add(com.github.javaparser.ast.expr.UnaryExpr.class);
         add(com.github.javaparser.ast.expr.VariableDeclarationExpr.class);
-        add(com.github.javaparser.ast.expr.SwitchExpr.class);
 
         add(com.github.javaparser.ast.stmt.AssertStmt.class);
         add(com.github.javaparser.ast.stmt.BlockStmt.class);
@@ -181,7 +182,9 @@ public class MetaModelGenerator extends AbstractGenerator {
         add(com.github.javaparser.ast.modules.ModuleUsesDirective.class);
     }};
 
-    static String METAMODEL_PACKAGE = "com.github.javaparser.metamodel";
+    public MetaModelGenerator(SourceRoot sourceRoot) {
+        super(sourceRoot);
+    }
 
     public static void main(String[] args) throws Exception {
         if (args.length != 1) {
@@ -200,10 +203,6 @@ public static void main(String[] args) throws Exception {
         sourceRoot.saveAll();
     }
 
-    public MetaModelGenerator(SourceRoot sourceRoot) {
-        super(sourceRoot);
-    }
-
     public void generate() throws Exception {
         final CompilationUnit javaParserMetaModelCu = sourceRoot.parse(METAMODEL_PACKAGE, "JavaParserMetaModel.java");
         javaParserMetaModelCu.setBlockComment(COPYRIGHT_NOTICE_JP_CORE);

diff --git a/...rator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java b/...rator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java
@@ -22,10 +22,13 @@
 package com.github.javaparser.generator.metamodel;
 
 import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
-import com.github.javaparser.ast.body.*;
+import com.github.javaparser.ast.body.BodyDeclaration;
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.body.ConstructorDeclaration;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.body.InitializerDeclaration;
 import com.github.javaparser.ast.stmt.Statement;
 import com.github.javaparser.generator.AbstractGenerator;
 import com.github.javaparser.metamodel.DerivedProperty;
@@ -98,7 +101,6 @@ public void generate(Class<? extends Node> nodeClass, ClassOrInterfaceDeclaratio
         final CompilationUnit classMetaModelJavaFile = new CompilationUnit(MetaModelGenerator.METAMODEL_PACKAGE);
         classMetaModelJavaFile.setBlockComment(COPYRIGHT_NOTICE_JP_CORE);
         classMetaModelJavaFile.addImport(Optional.class);
-        classMetaModelJavaFile.addImport(Generated.class);
         classMetaModelJavaFile.addImport(nodeClass);
 
         //