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

Merge branch '4285' into 'master'

4285

Closes af3#4285

See merge request !213
parents 9893c900 918942ef
No related branches found
No related tags found
1 merge request!2134285
VariabilityModelElementFactory.java 5a50d78b0fc94a20329b95991b519a3e3fbf4410 GREEN VariabilityModelElementFactory.java 5a50d78b0fc94a20329b95991b519a3e3fbf4410 GREEN
VariabilityStaticImpl.java d274310be2b110c002b3e514bc570fd5f4f6e48a GREEN VariabilityStaticImpl.java 96bc4364ebe635c94fafbd3ef60b8237b18c17c6 GREEN
...@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EObject; ...@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EObject;
import org.fortiss.variability.model.base.RemoveBindingStrategy; import org.fortiss.variability.model.base.RemoveBindingStrategy;
import org.fortiss.variability.model.features.AbstractAlternativeFeature; import org.fortiss.variability.model.features.AbstractAlternativeFeature;
import org.fortiss.variability.model.features.AbstractFeature; import org.fortiss.variability.model.features.AbstractFeature;
import org.fortiss.variability.model.features.AbstractFeatureModel;
import org.fortiss.variability.model.features.configuration.AlternativeFeatureConfiguration; import org.fortiss.variability.model.features.configuration.AlternativeFeatureConfiguration;
import org.fortiss.variability.model.features.configuration.CompositionalFeatureConfiguration; import org.fortiss.variability.model.features.configuration.CompositionalFeatureConfiguration;
import org.fortiss.variability.model.features.configuration.IFeatureConfiguration; import org.fortiss.variability.model.features.configuration.IFeatureConfiguration;
...@@ -327,6 +328,10 @@ public class VariabilityStaticImpl { ...@@ -327,6 +328,10 @@ public class VariabilityStaticImpl {
return false; return false;
} }
if(target instanceof AbstractFeatureModel) {
return subject == target;
}
return target.getClass() == subject.getClass() && return target.getClass() == subject.getClass() &&
((AbstractFeature)target).getName().equals(subject.getName()); ((AbstractFeature)target).getName().equals(subject.getName());
} }
......
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