refactor: use elementFactory in FMBuilder

Author: Julia Pham

src/main/java/de/vill/model/building/AbstractUVLElementFactory.java

@@ -5,13 +5,11 @@
 import de.vill.model.constraint.LiteralConstraint;
 
 public abstract class AbstractUVLElementFactory {
-    
+
     public abstract Feature createFeature(String name);
 
     public abstract <T> Attribute<T> createAttribute(String name, T value, Feature correspondingFeature);
 
     public abstract GlobalAttribute createGlobalAttribute(String identifier, FeatureModel featureModel);
 
-   // public abstract LiteralConstraint createFeatureLiteral(String name);
-
 }

src/main/java/de/vill/model/building/DefaultUVLElementFactory.java

@@ -4,25 +4,20 @@
 import de.vill.model.*;
 import de.vill.model.constraint.LiteralConstraint;
 
-public class DefaultUVLElementFactory extends AbstractUVLElementFactory{
+public class DefaultUVLElementFactory extends AbstractUVLElementFactory {
 
     @Override
-    public Feature createFeature(String name){
+    public Feature createFeature(String name) {
         return new Feature(name);
     }
 
     @Override
-    public <T> Attribute<T> createAttribute(String name, T value, Feature correspondingFeature){
+    public <T> Attribute<T> createAttribute(String name, T value, Feature correspondingFeature) {
         return new Attribute<>(name, value, correspondingFeature);
-    }   
+    }
 
     @Override
-    public GlobalAttribute createGlobalAttribute(String identifier, FeatureModel featureModel){
+    public GlobalAttribute createGlobalAttribute(String identifier, FeatureModel featureModel) {
         return new GlobalAttribute(identifier, featureModel);
     }
-
-    // @Override
-    // public LiteralConstraint createFeatureLiteral(String name){
-    //     return new LiteralConstraint(fmInConstruction.getFeatureMap().get(name));
-    // }
 }

src/main/java/de/vill/model/building/FeatureModelBuilder.java

@@ -13,21 +13,12 @@
 import java.util.Set;
 import java.util.function.Function;
 
-/**
- *
- */
 public class FeatureModelBuilder {
-
-    private Function<String, Feature> featureFactory = Feature::new;
 
     private FeatureModel fmInConstruction;
 
     private AbstractUVLElementFactory elementFactory;
 
-    public void setFeatureFactory(Function<String, Feature> featureFactory){
-        this.featureFactory = featureFactory;
-    } 
-
     public FeatureModelBuilder() {
         this(new DefaultUVLElementFactory());
     }
@@ -62,7 +53,7 @@ public boolean setRootFeature(Feature feature) {
     }
 
     public Feature addRootFeature(String featureName, FeatureType featureType, Cardinality cardinality) {
-        Feature rootFeature = featureFactory.apply(featureName);
+        Feature rootFeature = elementFactory.createFeature(featureName);
         rootFeature.setFeatureType(featureType);
         rootFeature.setCardinality(cardinality);
 
@@ -84,7 +75,7 @@ public Feature addFeature(String featureName, Group group, Import featureOrigin,
     }
 
     public Feature addFeature(String featureName, Group group, Import featureOrigin, FeatureType type, Cardinality cardinality) {
-        Feature feature = featureFactory.apply(featureName);
+        Feature feature = elementFactory.createFeature(featureName);
         feature.setRelatedImport(featureOrigin);
         feature.setFeatureType(type);
         feature.setCardinality(cardinality);