fixed Mill initialization in Java2CD

Author: jra-se

javaDSL/src/main/java/de/monticore/java/java2cd/Java2CDVisitor.java

@@ -13,6 +13,7 @@
 import de.monticore.cdinterfaceandenum._ast.ASTCDInterface;
 import de.monticore.generating.templateengine.GlobalExtensionManagement;
 import de.monticore.generating.templateengine.StringHookPoint;
+import de.monticore.java.javadsl.JavaDSLMill;
 import de.monticore.java.javadsl._ast.*;
 import de.monticore.java.javadsl._prettyprint.JavaDSLFullPrettyPrinter;
 import de.monticore.java.javadsl._visitor.JavaDSLVisitor2;
@@ -98,15 +99,15 @@ public void visit(ASTClassDeclaration ast) {
         if (i instanceof ASTMCQualifiedType) {
           interfaces.add(((ASTMCQualifiedType) i).getMCQualifiedName().getQName());
         } else {
-          interfaces.add(i.printType());
+          interfaces.add(printJavaDSLASTMCType(i));
         }
       }
     }
 
     if (ast.isPresentSuperClass()) {
       classBuilder = classBuilder
           .setCDExtendUsage(CDExtendUsageFacade.getInstance()
-              .createCDExtendUsage(getMCType(ast.getSuperClass()).printType()));
+              .createCDExtendUsage(printJavaDSLASTMCType(getMCType(ast.getSuperClass()))));
     }
 
     ASTCDClass cdClass = classBuilder.build();
@@ -127,7 +128,7 @@ public void visit(ASTRecordDeclaration ast) {
           .createCDInterfaceUsage(
               ast.getImplementedInterfaceList()
                   .stream()
-                  .map(ASTMCType::printType)
+                  .map(this::printJavaDSLASTMCType)
                   .toArray(String[]::new)));
     }
 
@@ -168,7 +169,7 @@ public void visit(ASTInterfaceDeclaration ast) {
             .createCDExtendUsage(
                 ast.getExtendedInterfaceList()
                     .stream()
-                    .map(ASTMCType::printType)
+                    .map(this::printJavaDSLASTMCType)
                     .toArray(String[]::new)))
         .build();
 
@@ -185,7 +186,7 @@ public void visit(ASTEnumDeclaration ast) {
             .createCDInterfaceUsage(
                 ast.getImplementedInterfaceList()
                     .stream()
-                    .map(ASTMCType::printType)
+                    .map(this::printJavaDSLASTMCType)
                     .toArray(String[]::new)))
         .build();
 
@@ -257,7 +258,7 @@ protected ASTMCType getMCType(ASTMCType mcType) {
   @Override
   public void visit(ASTMethodDeclaration ast) {
     ASTCDMethod method = CDMethodFacade.getInstance().createMethod(
-        getModifier(ast.getMCModifierList().stream().map(m -> (ASTJavaModifier) m).collect(Collectors.toList())),
+        getModifier(ast.getMCModifierList().stream().filter(m -> m instanceof ASTJavaModifier).map(m -> (ASTJavaModifier) m).collect(Collectors.toList())),
         ast.getName());
 
     if (ast.getMCReturnType().isPresentMCType()) {
@@ -399,4 +400,11 @@ protected ASTModifier getModifier(List<ASTJavaModifier> modifiers) {
   public ASTCDCompilationUnit getCompilationUnit() {
     return cdCompilationUnit;
   }
+  
+  public String printJavaDSLASTMCType(ASTMCType type) {
+    JavaDSLMill.init();
+    String printedType = type.printType();
+    CD4CodeMill.init();
+    return printedType;
+  }
 }

javaDSL/src/main/java/de/monticore/java/utils/JavaDSLSymbolTableUtil.java

@@ -45,7 +45,7 @@ public static List<IJavaDSLArtifactScope> buildSymbolTable(List<ASTCompilationUn
     stopwatch.reset().start();
     Log.info("Build - Phase 3", "SymbolTableConstruction");
     asts.forEach(JavaDSLSymbolTableUtil::runSymTabFinalization);
-    Log.info("Build - Phase 2 finished in " + stopwatch.elapsed(TimeUnit.MILLISECONDS)+"ms", "SymbolTableConstruction");
+    Log.info("Build - Phase 3 finished in " + stopwatch.elapsed(TimeUnit.MILLISECONDS)+"ms", "SymbolTableConstruction");
     return as;
   }