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

Merge branch '4272' into 'master'

4272

Closes af3#4272

See merge request !190
parents b65661b4 daaeef81
No related branches found
No related tags found
1 merge request!1904272
AlternativeConfigurationEditingSupport.java 209d1e382a150d03f6f05fbe8303ba8d521be0f0 GREEN AlternativeConfigurationEditingSupport.java adad0c5bb115c8c394bcd220135e9584a97e8aca GREEN
AlternativeVariationPointEditor.java 2c2d3d3779919ab033961075835e571350b7f7e2 GREEN AlternativeVariationPointEditor.java 2c2d3d3779919ab033961075835e571350b7f7e2 GREEN
AlternativesNamesEditingSupport.java f70f92388dc6038c8f00097c8c0331d52e9ea9c0 GREEN AlternativesNamesEditingSupport.java f70f92388dc6038c8f00097c8c0331d52e9ea9c0 GREEN
CheckBoxLabelProvider.java b810b06ec113dc499cb6f897d9515a067327bdb4 GREEN CheckBoxLabelProvider.java b810b06ec113dc499cb6f897d9515a067327bdb4 GREEN
......
...@@ -140,7 +140,7 @@ public class AlternativeConfigurationEditingSupport extends EditingSupport { ...@@ -140,7 +140,7 @@ public class AlternativeConfigurationEditingSupport extends EditingSupport {
protected void setValue(final Object element, final Object value) { protected void setValue(final Object element, final Object value) {
// Case distinction for the type of the assigned value // Case distinction for the type of the assigned value
if(value instanceof String) { if(value instanceof String) {
setValueString(element, (AbstractFeature)value); setValueString(element, (String)value);
return; return;
} }
...@@ -222,7 +222,7 @@ public class AlternativeConfigurationEditingSupport extends EditingSupport { ...@@ -222,7 +222,7 @@ public class AlternativeConfigurationEditingSupport extends EditingSupport {
} }
/** Sets the new value on the given AbstractFeature element. */ /** Sets the new value on the given AbstractFeature element. */
private void setValueString(final Object element, final AbstractFeature value) { private void setValueString(final Object element, final String value) {
// The only String, that might be selected is OPTIONAL_FEATURE_DESELECTED_LABEL // The only String, that might be selected is OPTIONAL_FEATURE_DESELECTED_LABEL
assert (value).equals(OPTIONAL_ALTERNATIVE_NOT_SELECTED_STRING); assert (value).equals(OPTIONAL_ALTERNATIVE_NOT_SELECTED_STRING);
// ... which shall only be there for AlternativeFeatureConfiguration // ... which shall only be there for AlternativeFeatureConfiguration
......
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