Refactor JavaModifiers

monticore-grammar/src/main/grammars/de/monticore/statements/MCCommonStatements.mc4

@@ -43,12 +43,56 @@ scope(non_exporting ordered) MCJavaBlock implements MCStatement
 
 /**
  * All the Java Modifier
+ * The method getModifier() ensures conservative behaviour with previous
+ * grammar definition that used an enumeration. The square brackets are
+ * required to generate the ASTConstantsMCCommonStatements constants.
  */
-JavaModifier implements MCModifier =
-      Modifier:["private" | "public" | "protected" | "static"
-          | "transient" | "final" | "abstract" | "native"
-          | "threadsafe" | "synchronized" | "const" | "volatile"
-          | "strictfp" | modifier_default:"default"] ;
+interface JavaModifier extends MCModifier;
+
+astrule JavaModifier
+    = method public int getModifier(){};
+
+ModifierPrivate implements JavaModifier
+    = [private:"private"];
+
+ModifierProtected implements JavaModifier
+    = [protected:"protected"];
+
+ModifierPublic implements JavaModifier
+    = [public:"public"];
+
+ModifierStatic implements JavaModifier
+    = [static:"static"];
+
+ModifierTransient implements JavaModifier
+    = [transient:"transient"];
+
+ModifierFinal implements JavaModifier
+    = [final:"final"];
+
+ModifierAbstract implements JavaModifier
+    = [abstract:"abstract"];
+
+ModifierNative implements JavaModifier
+    = [native:"native"];
+
+ModifierThreadsafe implements JavaModifier
+    = [threadsafe:"threadsafe"];
+
+ModifierSynchronized implements JavaModifier
+    = [synchronized:"synchronized"];
+
+ModifierConst implements JavaModifier
+    = [const:"const"];
+
+ModifierVolatile implements JavaModifier
+    = [volatile:"volatile"];
+
+ModifierStrictFp implements JavaModifier
+    = [strictfp:"strictfp"];
+
+ModifierDefault implements JavaModifier
+    = [modifier_default:"default"];
 
 IfStatement implements MCStatement
     =   "if" "(" condition:Expression ")"

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierAbstract.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierAbstract extends ASTModifierAbstractTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.ABSTRACT;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierConst.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierConst extends ASTModifierConstTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.CONST;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierDefault.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierDefault extends ASTModifierDefaultTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.MODIFIER_DEFAULT;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierFinal.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierFinal extends ASTModifierFinalTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.FINAL;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierNative.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierNative extends ASTModifierNativeTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.NATIVE;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierPrivate.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierPrivate extends ASTModifierPrivateTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.PRIVATE;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierProtected.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierProtected extends ASTModifierProtectedTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.PROTECTED;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierPublic.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierPublic extends ASTModifierPublicTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.PUBLIC;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierStatic.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierStatic extends ASTModifierStaticTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.STATIC;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierStrictFp.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierStrictFp extends ASTModifierStrictFpTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.STRICTFP;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierSynchronized.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierSynchronized extends ASTModifierSynchronizedTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.SYNCHRONIZED;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierThreadsafe.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierThreadsafe extends ASTModifierThreadsafeTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.THREADSAFE;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierTransient.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierTransient extends ASTModifierTransientTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.TRANSIENT;
+  }
+}

monticore-grammar/src/main/java/de/monticore/statements/mccommonstatements/_ast/ASTModifierVolatile.java

@@ -0,0 +1,9 @@
+package de.monticore.statements.mccommonstatements._ast;
+
+public class ASTModifierVolatile extends ASTModifierVolatileTOP {
+
+  @Override
+  public int getModifier() {
+    return ASTConstantsMCCommonStatements.VOLATILE;
+  }
+}