Merge branch 'issue-32' into fix/long-constraint-stack-overflow

Author: SundermannC

src/main/java/de/vill/main/UVLListener.java

@@ -49,7 +49,15 @@
 import org.antlr.v4.runtime.Token;
 
 public class UVLListener extends UVLJavaParserBaseListener {
-    public FeatureModelBuilder fmBuilder = new FeatureModelBuilder();
+    public FeatureModelBuilder fmBuilder;
+
+    public UVLListener() {
+        this(new FeatureModelBuilder());
+    }
+
+    public UVLListener(FeatureModelBuilder fmBuilder) {
+        this.fmBuilder = fmBuilder;
+    }
     private Set<LanguageLevel> importedLanguageLevels = new HashSet<>(Arrays.asList(LanguageLevel.BOOLEAN_LEVEL));
     private Stack<Feature> featureStack = new Stack<>();
     private Stack<Group> groupStack = new Stack<>();

src/main/java/de/vill/main/UVLModelFactory.java

@@ -1,6 +1,9 @@
 package de.vill.main;
 
 import de.vill.model.*;
+import de.vill.model.building.AbstractUVLElementFactory;
+import de.vill.model.building.DefaultUVLElementFactory;
+import de.vill.model.building.FeatureModelBuilder;
 import de.vill.model.building.VariableReference;
 import de.vill.model.constraint.*;
 import de.vill.model.expression.*;
@@ -42,10 +45,16 @@ public class UVLModelFactory {
 
     private final Map<LanguageLevel, Class<? extends IConversionStrategy>> conversionStrategiesDrop;
     private final Map<LanguageLevel, Class<? extends IConversionStrategy>> conversionStrategiesConvert;
+    private final AbstractUVLElementFactory elementFactory;
 
     private final List<ParseError> errorList = new LinkedList<>();
 
     public UVLModelFactory() {
+        this(new DefaultUVLElementFactory());
+    }
+
+    public UVLModelFactory(AbstractUVLElementFactory elementFactory) {
+        this.elementFactory = elementFactory;
         this.conversionStrategiesDrop = new HashMap<>();
         this.conversionStrategiesDrop.put(LanguageLevel.GROUP_CARDINALITY, DropGroupCardinality.class);
         this.conversionStrategiesDrop.put(LanguageLevel.FEATURE_CARDINALITY, DropFeatureCardinality.class);
@@ -123,8 +132,9 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
             }
         });
 
-        UVLListener uvlListener = new UVLListener();
+        UVLListener uvlListener = createUVLListener();
         IterativeParseTreeWalker walker = new IterativeParseTreeWalker();
+       
         walker.walk(uvlListener, UVLJavaParser.constraintLine());
 
         return uvlListener.getConstraint();
@@ -271,6 +281,10 @@ private List<LanguageLevel> getActualLanguageLevelsToRemoveInOrder(FeatureModel
         return completeOrderedLevelsToRemove;
     }
 
+    private UVLListener createUVLListener() {
+        return new UVLListener(new FeatureModelBuilder(elementFactory));
+    }
+
     private String getPath(String rootPath, Import referencedImport) {
         return rootPath + FileSystems.getDefault().getSeparator() + referencedImport.getNamespace().replace(".", FileSystems.getDefault().getSeparator()) + ".uvl";
     }
@@ -300,8 +314,10 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
         });
 
 
-        UVLListener uvlListener = new UVLListener();
+    
+        UVLListener uvlListener = createUVLListener();
         IterativeParseTreeWalker walker = new IterativeParseTreeWalker();
+        
         walker.walk(uvlListener, UVLJavaParser.featureModel());
         FeatureModel featureModel = null;