diff --git a/org.fortiss.variability/src/org/fortiss/variability/bind/.ratings b/org.fortiss.variability/src/org/fortiss/variability/bind/.ratings index 3605be12add1db005d633c7514aae2e59366c900..41205ae0d3087189b3536a2700fdcfed99d2d544 100644 --- a/org.fortiss.variability/src/org/fortiss/variability/bind/.ratings +++ b/org.fortiss.variability/src/org/fortiss/variability/bind/.ratings @@ -1 +1 @@ -BindUtils.java 733569d1499274091ed59d06aaacbe386fdfcc94 GREEN +BindUtils.java 70f1f62f7eca035d5c84f28ddfac26bf639c27cd GREEN diff --git a/org.fortiss.variability/src/org/fortiss/variability/bind/BindUtils.java b/org.fortiss.variability/src/org/fortiss/variability/bind/BindUtils.java index 733569d1499274091ed59d06aaacbe386fdfcc94..70f1f62f7eca035d5c84f28ddfac26bf639c27cd 100644 --- a/org.fortiss.variability/src/org/fortiss/variability/bind/BindUtils.java +++ b/org.fortiss.variability/src/org/fortiss/variability/bind/BindUtils.java @@ -140,8 +140,11 @@ public class BindUtils { final CompositionalFeatureConfiguration compConf = (CompositionalFeatureConfiguration)conf; - return checkVariantConfigurationForCompositionalFeature(selectedFeatures, - requiredFeatures, excludedFeatures, compFeature, compConf); + Pair<String, List<EObject>> res = checkVariantConfigurationForCompositionalFeature( + selectedFeatures, requiredFeatures, excludedFeatures, compFeature, compConf); + if(res != null) { + return res; + } } if(feature instanceof AbstractAlternativeFeature) { final AbstractAlternativeFeature altFeature = (AbstractAlternativeFeature)feature; @@ -156,8 +159,12 @@ public class BindUtils { final AlternativeFeatureConfiguration altConf = (AlternativeFeatureConfiguration)conf; final IFeatureConfiguration<?> altSelectedConf = altConf.getSelectedConfiguration(); - return checkVariantConfigurationForAlternativeFeature(selectedFeatures, - requiredFeatures, excludedFeatures, altFeature, altSelectedConf); + Pair<String, List<EObject>> res = + checkVariantConfigurationForAlternativeFeature(selectedFeatures, + requiredFeatures, excludedFeatures, altFeature, altSelectedConf); + if(res != null) { + return res; + } } // Check constraints