Skip to content
Snippets Groups Projects
Commit 37d7273e authored by Andreas Bayha's avatar Andreas Bayha
Browse files

Variability: Renamed product-line analysis


ProductLineBaseAnalysis -> GenericProductLineAnalysis
ProductLineBaseTranslation -> GenericProductLineTranslation

Issue-ref: 4240
Issue-URL: af3#4240

Signed-off-by: default avatarAndreas Bayha <bayha@fortiss.org>
parent 1d4843b3
No related branches found
No related tags found
1 merge request!1784240
Pipeline #37815 passed
Pipeline: maven-releng

#37816

    ......@@ -26,8 +26,8 @@ import org.eclipse.emf.ecore.EClass;
    import org.eclipse.emf.ecore.EObject;
    import org.fortiss.tooling.base.model.layout.LayoutPackage;
    import org.fortiss.tooling.kernel.model.IProjectRootElement;
    import org.fortiss.variability.analysis.ProductLineBaseAnalysis;
    import org.fortiss.variability.analysis.ProductLineBaseTranslation;
    import org.fortiss.variability.analysis.GenericProductLineAnalysis;
    import org.fortiss.variability.analysis.GenericProductLineTranslation;
    import org.fortiss.variability.analysis.ProductLineConstraintViolation;
    /**
    ......@@ -35,7 +35,7 @@ import org.fortiss.variability.analysis.ProductLineConstraintViolation;
    *
    * @author bayha
    */
    public class ProductLineAnalysis extends ProductLineBaseAnalysis {
    public class ProductLineAnalysis extends GenericProductLineAnalysis {
    /**
    * Constructor.
    ......@@ -49,7 +49,7 @@ public class ProductLineAnalysis extends ProductLineBaseAnalysis {
    /**
    * Constructor.
    */
    protected ProductLineAnalysis(EObject model, ProductLineBaseTranslation translation) {
    protected ProductLineAnalysis(EObject model, GenericProductLineTranslation translation) {
    super(model, translation);
    }
    ......
    ......@@ -19,7 +19,7 @@ import static org.fortiss.tooling.ext.variability.util.VariabilityUtils.calculat
    import org.eclipse.emf.ecore.EObject;
    import org.fortiss.tooling.base.model.element.IModelElementSpecification;
    import org.fortiss.variability.analysis.ProductLineBaseTranslation;
    import org.fortiss.variability.analysis.GenericProductLineTranslation;
    import org.fortiss.variability.model.presence.PresenceConditionTerm;
    /**
    ......@@ -28,7 +28,7 @@ import org.fortiss.variability.model.presence.PresenceConditionTerm;
    *
    * @author bayha
    */
    public class ProductLineTranslation extends ProductLineBaseTranslation {
    public class ProductLineTranslation extends GenericProductLineTranslation {
    /** {@inheritDoc} */
    @Override
    ......
    ......@@ -29,9 +29,9 @@ import com.microsoft.z3.Status;
    *
    * @author bayha
    */
    public class ProductLineBaseAnalysis {
    public class GenericProductLineAnalysis {
    protected final ProductLineBaseTranslation translation;
    protected final GenericProductLineTranslation translation;
    /** List of all translated correctness constraints. */
    protected List<BoolExpr> rawConstraints = new ArrayList<BoolExpr>();
    ......@@ -50,7 +50,7 @@ public class ProductLineBaseAnalysis {
    /**
    * Constructor.
    */
    protected ProductLineBaseAnalysis(EObject model, ProductLineBaseTranslation translation) {
    protected GenericProductLineAnalysis(EObject model, GenericProductLineTranslation translation) {
    this.model = model;
    this.translation = translation;
    ......
    ......@@ -56,7 +56,7 @@ import com.microsoft.z3.Symbol;
    *
    * @author bayha
    */
    public class ProductLineBaseTranslation {
    public class GenericProductLineTranslation {
    /** Z3 sort for base type integer. */
    protected IntSort intSort;
    ......@@ -136,7 +136,7 @@ public class ProductLineBaseTranslation {
    /**
    * Constructor.
    */
    protected ProductLineBaseTranslation() {
    protected GenericProductLineTranslation() {
    initialize();
    }
    ......
    ......@@ -25,7 +25,7 @@ import com.microsoft.z3.BoolExpr;
    import com.microsoft.z3.Expr;
    /**
    * Interface for product line constraints to be checked by the {@link ProductLineBaseAnalysis}.
    * Interface for product line constraints to be checked by the {@link GenericProductLineAnalysis}.
    *
    * Note that usually this interface should not be implemented immediately. Instead use the base
    * class {@link ProductLineConstraintBase} to define new constraints.
    ......
    ......@@ -60,11 +60,11 @@ public abstract class ProductLineConstraintBase implements IProductLineConstrain
    /** A map from variable names to expressions which can be used in the body. */
    protected Map<String, Expr> name2Variables = new HashMap<String, Expr>();
    /** The {@link ProductLineBaseTranslation} to be used for creation of variables. */
    protected ProductLineBaseTranslation translation;
    /** The {@link GenericProductLineTranslation} to be used for creation of variables. */
    protected GenericProductLineTranslation translation;
    /** Constructor. */
    public ProductLineConstraintBase(ProductLineBaseTranslation translation) {
    public ProductLineConstraintBase(GenericProductLineTranslation translation) {
    this.translation = translation;
    variableTypes = createVariablesClasses();
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment