diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/model/all.components b/plugins/org.obeonetwork.dsl.uml2.properties/model/all.components index 819afc56a..0f6ff9c25 100644 --- a/plugins/org.obeonetwork.dsl.uml2.properties/model/all.components +++ b/plugins/org.obeonetwork.dsl.uml2.properties/model/all.components @@ -213,11 +213,11 @@ - - - - + + + + @@ -381,14 +381,14 @@ - - - - + + + + - + diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/AssociationPropertiesEditionComponent.java b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/AssociationPropertiesEditionComponent.java index 27bd32651..618d1745f 100644 --- a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/AssociationPropertiesEditionComponent.java +++ b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/AssociationPropertiesEditionComponent.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.obeonetwork.dsl.uml2.properties.uml.components; -import org.eclipse.uml2.uml.Class; -import org.eclipse.uml2.uml.Package; -import org.eclipse.uml2.uml.VisibilityKind; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PortPropertiesEditionComponent.java b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PortPropertiesEditionComponent.java index edd77658e..66b36e905 100644 --- a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PortPropertiesEditionComponent.java +++ b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PortPropertiesEditionComponent.java @@ -140,9 +140,17 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource) // set the button mode generalPart.setTypeButtonMode(ButtonsModeEnum.BROWSE); } - // FIXME NO VALID CASE INTO template public updater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Port. - // FIXME NO VALID CASE INTO template public updater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Port. - // FIXME NO VALID CASE INTO template public updater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : defaultValue, General, Port. + if (isAccessible(UmlViewsRepository.General.lowerValue)) { + generalPart.setLowerValue(EEFConverterUtil.convertToString(TypesPackage.Literals.INTEGER, port.getLower())); + } + + if (isAccessible(UmlViewsRepository.General.upperValue)) { + generalPart.setUpperValue(EEFConverterUtil.convertToString(TypesPackage.Literals.UNLIMITED_NATURAL, port.getUpper())); + } + + if (isAccessible(UmlViewsRepository.General.defaultValue)) + generalPart.setDefaultValue(EEFConverterUtil.convertToString(TypesPackage.Literals.STRING, port.getDefault())); + generalPart.setBehavior(port.isBehavior()); generalPart.setService(port.isService()); @@ -159,9 +167,9 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource) - // FIXME NO VALID CASE INTO template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Port. - // FIXME NO VALID CASE INTO template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Port. - // FIXME NO VALID CASE INTO template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : defaultValue, General, Port. + + + // init values for referenced views @@ -228,14 +236,14 @@ public EStructuralFeature associatedFeature(Object editorKey) { if (editorKey == UmlViewsRepository.General.type) { return UMLPackage.eINSTANCE.getTypedElement_Type(); } - if (editorKey == UmlViewsRepository.General.upperValue) { - return UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue(); - } if (editorKey == UmlViewsRepository.General.lowerValue) { - return UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue(); + return UMLPackage.eINSTANCE.getMultiplicityElement_Lower(); + } + if (editorKey == UmlViewsRepository.General.upperValue) { + return UMLPackage.eINSTANCE.getMultiplicityElement_Upper(); } if (editorKey == UmlViewsRepository.General.defaultValue) { - return UMLPackage.eINSTANCE.getProperty_DefaultValue(); + return UMLPackage.eINSTANCE.getProperty_Default(); } if (editorKey == UmlViewsRepository.General.Qualifiers.behavior) { return UMLPackage.eINSTANCE.getPort_IsBehavior(); @@ -291,14 +299,14 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) { } } } - if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { - // FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : upperValue, General, Port. - } if (UmlViewsRepository.General.lowerValue == event.getAffectedEditor()) { - // FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : lowerValue, General, Port. + port.setLower((EEFConverterUtil.createIntFromString(TypesPackage.Literals.INTEGER, (String)event.getNewValue()))); + } + if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { + port.setUpper((EEFConverterUtil.createIntFromString(TypesPackage.Literals.UNLIMITED_NATURAL, (String)event.getNewValue()))); } if (UmlViewsRepository.General.defaultValue == event.getAffectedEditor()) { - // FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : defaultValue, General, Port. + port.setDefault((java.lang.String)EEFConverterUtil.createFromString(TypesPackage.Literals.STRING, (String)event.getNewValue())); } if (UmlViewsRepository.General.Qualifiers.behavior == event.getAffectedEditor()) { port.setIsBehavior((Boolean)event.getNewValue()); @@ -352,9 +360,27 @@ public void updatePart(Notification msg) { if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(msg.getFeature()) && generalPart != null && isAccessible(UmlViewsRepository.General.type)) generalPart.setType((EObject)msg.getNewValue()); - // FIXME INVALID CASE INTO template public liveUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Port. - // FIXME INVALID CASE INTO template public liveUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Port. - // FIXME INVALID CASE INTO template public liveUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : defaultValue, General, Port. + if (UMLPackage.eINSTANCE.getMultiplicityElement_Lower().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.lowerValue)) { + if (msg.getNewValue() != null) { + generalPart.setLowerValue(EcoreUtil.convertToString(TypesPackage.Literals.INTEGER, msg.getNewValue())); + } else { + generalPart.setLowerValue(""); + } + } + if (UMLPackage.eINSTANCE.getMultiplicityElement_Upper().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.upperValue)) { + if (msg.getNewValue() != null) { + generalPart.setUpperValue(EcoreUtil.convertToString(TypesPackage.Literals.UNLIMITED_NATURAL, msg.getNewValue())); + } else { + generalPart.setUpperValue(""); + } + } + if (UMLPackage.eINSTANCE.getProperty_Default().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.defaultValue)) { + if (msg.getNewValue() != null) { + generalPart.setDefaultValue(EcoreUtil.convertToString(TypesPackage.Literals.STRING, msg.getNewValue())); + } else { + generalPart.setDefaultValue(""); + } + } if (UMLPackage.eINSTANCE.getPort_IsBehavior().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.Qualifiers.behavior)) generalPart.setBehavior((Boolean)msg.getNewValue()); @@ -384,9 +410,9 @@ protected NotificationFilter[] getNotificationFilters() { UMLPackage.eINSTANCE.getProperty_IsDerivedUnion(), UMLPackage.eINSTANCE.getProperty_Aggregation(), UMLPackage.eINSTANCE.getTypedElement_Type(), - UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue(), - UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue(), - UMLPackage.eINSTANCE.getProperty_DefaultValue(), + UMLPackage.eINSTANCE.getMultiplicityElement_Lower(), + UMLPackage.eINSTANCE.getMultiplicityElement_Upper(), + UMLPackage.eINSTANCE.getProperty_Default(), UMLPackage.eINSTANCE.getPort_IsBehavior(), UMLPackage.eINSTANCE.getPort_IsService() ); return new NotificationFilter[] {filter,}; @@ -397,7 +423,7 @@ protected NotificationFilter[] getNotificationFilters() { * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#mustBeComposed(java.lang.Object, int) */ public boolean mustBeComposed(Object key, int kind) { - return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.Qualifiers.ordered || key == UmlViewsRepository.General.Qualifiers.unique || key == UmlViewsRepository.General.Qualifiers.readOnly || key == UmlViewsRepository.General.Qualifiers.derived || key == UmlViewsRepository.General.Qualifiers.derivedUnion || key == UmlViewsRepository.General.aggregation || key == UmlViewsRepository.General.type || key == UmlViewsRepository.General.upperValue || key == UmlViewsRepository.General.lowerValue || key == UmlViewsRepository.General.defaultValue || key == UmlViewsRepository.General.Qualifiers.behavior || key == UmlViewsRepository.General.Qualifiers.service || key == UmlViewsRepository.General.Qualifiers.class; + return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.Qualifiers.ordered || key == UmlViewsRepository.General.Qualifiers.unique || key == UmlViewsRepository.General.Qualifiers.readOnly || key == UmlViewsRepository.General.Qualifiers.derived || key == UmlViewsRepository.General.Qualifiers.derivedUnion || key == UmlViewsRepository.General.aggregation || key == UmlViewsRepository.General.type || key == UmlViewsRepository.General.lowerValue || key == UmlViewsRepository.General.upperValue || key == UmlViewsRepository.General.defaultValue || key == UmlViewsRepository.General.Qualifiers.behavior || key == UmlViewsRepository.General.Qualifiers.service || key == UmlViewsRepository.General.Qualifiers.class; } /** @@ -490,6 +516,27 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) { } ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getProperty_Aggregation().getEAttributeType(), newValue); } + if (UmlViewsRepository.General.lowerValue == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getMultiplicityElement_Lower().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getMultiplicityElement_Lower().getEAttributeType(), newValue); + } + if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getMultiplicityElement_Upper().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getMultiplicityElement_Upper().getEAttributeType(), newValue); + } + if (UmlViewsRepository.General.defaultValue == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getProperty_Default().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getProperty_Default().getEAttributeType(), newValue); + } if (UmlViewsRepository.General.Qualifiers.behavior == event.getAffectedEditor()) { Object newValue = event.getNewValue(); if (newValue instanceof String) { diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PropertyPropertiesEditionComponent.java b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PropertyPropertiesEditionComponent.java index 47fd0ffde..196c60540 100644 --- a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PropertyPropertiesEditionComponent.java +++ b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/org/obeonetwork/dsl/uml2/properties/uml/components/PropertyPropertiesEditionComponent.java @@ -133,8 +133,14 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource) if (isAccessible(UmlViewsRepository.General.aggregation)) { generalPart.initAggregation(EEFUtils.choiceOfValues(property, UMLPackage.eINSTANCE.getProperty_Aggregation()), property.getAggregation()); } - // FIXME NO VALID CASE INTO template public updater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Property. - // FIXME NO VALID CASE INTO template public updater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Property. + if (isAccessible(UmlViewsRepository.General.lowerValue)) { + generalPart.setLowerValue(EEFConverterUtil.convertToString(TypesPackage.Literals.INTEGER, property.getLower())); + } + + if (isAccessible(UmlViewsRepository.General.upperValue)) { + generalPart.setUpperValue(EEFConverterUtil.convertToString(TypesPackage.Literals.UNLIMITED_NATURAL, property.getUpper())); + } + if (isAccessible(UmlViewsRepository.General.defaultValue)) generalPart.setDefaultValue(EEFConverterUtil.convertToString(TypesPackage.Literals.STRING, property.getDefault())); @@ -156,8 +162,8 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource) - // FIXME NO VALID CASE INTO template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Property. - // FIXME NO VALID CASE INTO template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Property. + + // init values for referenced views @@ -219,11 +225,11 @@ public EStructuralFeature associatedFeature(Object editorKey) { if (editorKey == UmlViewsRepository.General.aggregation) { return UMLPackage.eINSTANCE.getProperty_Aggregation(); } - if (editorKey == UmlViewsRepository.General.upperValue) { - return UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue(); - } if (editorKey == UmlViewsRepository.General.lowerValue) { - return UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue(); + return UMLPackage.eINSTANCE.getMultiplicityElement_Lower(); + } + if (editorKey == UmlViewsRepository.General.upperValue) { + return UMLPackage.eINSTANCE.getMultiplicityElement_Upper(); } if (editorKey == UmlViewsRepository.General.defaultValue) { return UMLPackage.eINSTANCE.getProperty_Default(); @@ -265,11 +271,11 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) { if (UmlViewsRepository.General.aggregation == event.getAffectedEditor()) { property.setAggregation((AggregationKind)event.getNewValue()); } - if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { - // FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : upperValue, General, Property. - } if (UmlViewsRepository.General.lowerValue == event.getAffectedEditor()) { - // FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : lowerValue, General, Property. + property.setLower((EEFConverterUtil.createIntFromString(TypesPackage.Literals.INTEGER, (String)event.getNewValue()))); + } + if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { + property.setUpper((EEFConverterUtil.createIntFromString(TypesPackage.Literals.UNLIMITED_NATURAL, (String)event.getNewValue()))); } if (UmlViewsRepository.General.defaultValue == event.getAffectedEditor()) { property.setDefault((java.lang.String)EEFConverterUtil.createFromString(TypesPackage.Literals.STRING, (String)event.getNewValue())); @@ -332,8 +338,20 @@ public void updatePart(Notification msg) { if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(UmlViewsRepository.General.aggregation)) generalPart.setAggregation((AggregationKind)msg.getNewValue()); - // FIXME INVALID CASE INTO template public liveUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : upperValue, General, Property. - // FIXME INVALID CASE INTO template public liveUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) in widgetControl.mtl module, with the values : lowerValue, General, Property. + if (UMLPackage.eINSTANCE.getMultiplicityElement_Lower().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.lowerValue)) { + if (msg.getNewValue() != null) { + generalPart.setLowerValue(EcoreUtil.convertToString(TypesPackage.Literals.INTEGER, msg.getNewValue())); + } else { + generalPart.setLowerValue(""); + } + } + if (UMLPackage.eINSTANCE.getMultiplicityElement_Upper().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.upperValue)) { + if (msg.getNewValue() != null) { + generalPart.setUpperValue(EcoreUtil.convertToString(TypesPackage.Literals.UNLIMITED_NATURAL, msg.getNewValue())); + } else { + generalPart.setUpperValue(""); + } + } if (UMLPackage.eINSTANCE.getProperty_Default().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && generalPart != null && isAccessible(UmlViewsRepository.General.defaultValue)) { if (msg.getNewValue() != null) { generalPart.setDefaultValue(EcoreUtil.convertToString(TypesPackage.Literals.STRING, msg.getNewValue())); @@ -365,8 +383,8 @@ protected NotificationFilter[] getNotificationFilters() { UMLPackage.eINSTANCE.getProperty_IsDerived(), UMLPackage.eINSTANCE.getProperty_IsDerivedUnion(), UMLPackage.eINSTANCE.getProperty_Aggregation(), - UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue(), - UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue(), + UMLPackage.eINSTANCE.getMultiplicityElement_Lower(), + UMLPackage.eINSTANCE.getMultiplicityElement_Upper(), UMLPackage.eINSTANCE.getProperty_Default(), UMLPackage.eINSTANCE.getTypedElement_Type() ); return new NotificationFilter[] {filter,}; @@ -377,7 +395,7 @@ protected NotificationFilter[] getNotificationFilters() { * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#mustBeComposed(java.lang.Object, int) */ public boolean mustBeComposed(Object key, int kind) { - return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.Qualifiers.ordered || key == UmlViewsRepository.General.Qualifiers.unique || key == UmlViewsRepository.General.Qualifiers.readOnly || key == UmlViewsRepository.General.Qualifiers.derived || key == UmlViewsRepository.General.Qualifiers.derivedUnion || key == UmlViewsRepository.General.aggregation || key == UmlViewsRepository.General.upperValue || key == UmlViewsRepository.General.lowerValue || key == UmlViewsRepository.General.defaultValue || key == UmlViewsRepository.General.type || key == UmlViewsRepository.General.Qualifiers.class; + return key == UmlViewsRepository.General.name || key == UmlViewsRepository.General.visibility || key == UmlViewsRepository.General.Qualifiers.static_ || key == UmlViewsRepository.General.Qualifiers.leaf || key == UmlViewsRepository.General.Qualifiers.ordered || key == UmlViewsRepository.General.Qualifiers.unique || key == UmlViewsRepository.General.Qualifiers.readOnly || key == UmlViewsRepository.General.Qualifiers.derived || key == UmlViewsRepository.General.Qualifiers.derivedUnion || key == UmlViewsRepository.General.aggregation || key == UmlViewsRepository.General.lowerValue || key == UmlViewsRepository.General.upperValue || key == UmlViewsRepository.General.defaultValue || key == UmlViewsRepository.General.type || key == UmlViewsRepository.General.Qualifiers.class; } /** @@ -470,6 +488,20 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) { } ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getProperty_Aggregation().getEAttributeType(), newValue); } + if (UmlViewsRepository.General.lowerValue == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getMultiplicityElement_Lower().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getMultiplicityElement_Lower().getEAttributeType(), newValue); + } + if (UmlViewsRepository.General.upperValue == event.getAffectedEditor()) { + Object newValue = event.getNewValue(); + if (newValue instanceof String) { + newValue = EEFConverterUtil.createFromString(UMLPackage.eINSTANCE.getMultiplicityElement_Upper().getEAttributeType(), (String)newValue); + } + ret = Diagnostician.INSTANCE.validate(UMLPackage.eINSTANCE.getMultiplicityElement_Upper().getEAttributeType(), newValue); + } if (UmlViewsRepository.General.defaultValue == event.getAffectedEditor()) { Object newValue = event.getNewValue(); if (newValue instanceof String) { diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/uml_properties.plugin.xml b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/uml_properties.plugin.xml index a44f93d7d..3e457386d 100644 --- a/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/uml_properties.plugin.xml +++ b/plugins/org.obeonetwork.dsl.uml2.properties/src-gen/uml_properties.plugin.xml @@ -6,7 +6,7 @@