diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java index 7876c0943b54ad6b299fafcce7539861bbae3e49..ce18071329aa1c5c2820509d8df3979c92ec8569 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbbreviationItemProvider.java @@ -75,11 +75,17 @@ public class AbbreviationItemProvider extends NsdObjectItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Abbreviation_descID_feature" ), + getResourceLocator(), + getString( "_UI_Abbreviation_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Abbreviation_descID_feature", "_UI_Abbreviation_type" ), - NsdPackage.Literals.ABBREVIATION__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ABBREVIATION__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -91,11 +97,17 @@ public class AbbreviationItemProvider extends NsdObjectItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Abbreviation_name_feature" ), + getResourceLocator(), + getString( "_UI_Abbreviation_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Abbreviation_name_feature", "_UI_Abbreviation_type" ), - NsdPackage.Literals.ABBREVIATION__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ABBREVIATION__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java index f42e227c479793ef52e225a9d44479493dc86d8c..437465aeae831518c751b63307cec6697c89f31c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AbstractLNClassItemProvider.java @@ -76,11 +76,17 @@ public class AbstractLNClassItemProvider extends AnyLNClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AbstractLNClass_name_feature" ), + getResourceLocator(), + getString( "_UI_AbstractLNClass_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AbstractLNClass_name_feature", "_UI_AbstractLNClass_type" ), - NsdPackage.Literals.ABSTRACT_LN_CLASS__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ABSTRACT_LN_CLASS__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -90,13 +96,19 @@ public class AbstractLNClassItemProvider extends AnyLNClassItemProvider { * @generated */ protected void addReferredByAnyLNClassPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AbstractLNClass_referredByAnyLNClass_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AbstractLNClass_referredByAnyLNClass_feature", - "_UI_AbstractLNClass_type" ), - NsdPackage.Literals.ABSTRACT_LN_CLASS__REFERRED_BY_ANY_LN_CLASS, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AbstractLNClass_referredByAnyLNClass_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AbstractLNClass_referredByAnyLNClass_feature", "_UI_AbstractLNClass_type" ), + NsdPackage.Literals.ABSTRACT_LN_CLASS__REFERRED_BY_ANY_LN_CLASS, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgArrayItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgArrayItemProvider.java index 7f8ff9472bb70f7ea36f8c48184aa5619e32c7b0..a4f584ca91dd569b7611f38f5e088cca4d308ca4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgArrayItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgArrayItemProvider.java @@ -87,11 +87,17 @@ public class AgArrayItemProvider extends ItemProviderAdapter implements IEditing protected void addIsArrayPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_isArray_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_isArray_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_isArray_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__IS_ARRAY, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__IS_ARRAY, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -103,11 +109,17 @@ public class AgArrayItemProvider extends ItemProviderAdapter implements IEditing protected void addMaxIndexAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_maxIndexAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_maxIndexAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_maxIndexAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -119,11 +131,17 @@ public class AgArrayItemProvider extends ItemProviderAdapter implements IEditing protected void addMinIndexPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_minIndex_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_minIndex_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_minIndex_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MIN_INDEX, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MIN_INDEX, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -135,11 +153,17 @@ public class AgArrayItemProvider extends ItemProviderAdapter implements IEditing protected void addSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_sizeAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_sizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_sizeAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeAndValuesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeAndValuesItemProvider.java index a5024c51b527c43343572d97b5639406238e0eed..7ac9d329ca7511d6d8e68007dcee9e62125890dc 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeAndValuesItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeAndValuesItemProvider.java @@ -76,12 +76,18 @@ public class AgAttributeTypeAndValuesItemProvider extends AgAttributeTypeItemPro */ protected void addDefaultValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_defaultValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_defaultValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -93,11 +99,17 @@ public class AgAttributeTypeAndValuesItemProvider extends AgAttributeTypeItemPro protected void addMaxValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_maxValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -109,11 +121,17 @@ public class AgAttributeTypeAndValuesItemProvider extends AgAttributeTypeItemPro protected void addMinValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_minValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeItemProvider.java index 6a285cbb7f0072925cf6f78ffd34fbb83aeb414f..875a70d2a2bd8923fb0fa9e6149227327683ef9c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgAttributeTypeItemProvider.java @@ -85,11 +85,17 @@ public class AgAttributeTypeItemProvider extends ItemProviderAdapter implements protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_type_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_type_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -101,11 +107,17 @@ public class AgAttributeTypeItemProvider extends ItemProviderAdapter implements protected void addTypeKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_typeKind_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_typeKind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_typeKind_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSIdentificationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSIdentificationItemProvider.java index c4d2ab93ae103f7b4f4c5e5d3ea90382ec53f179..3ea99e03c95a181f1a0540b26eddc133a73ffd98 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSIdentificationItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSIdentificationItemProvider.java @@ -88,11 +88,17 @@ public class AgNSIdentificationItemProvider extends ItemProviderAdapter implemen protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -104,11 +110,17 @@ public class AgNSIdentificationItemProvider extends ItemProviderAdapter implemen protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -120,11 +132,17 @@ public class AgNSIdentificationItemProvider extends ItemProviderAdapter implemen protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -136,11 +154,17 @@ public class AgNSIdentificationItemProvider extends ItemProviderAdapter implemen protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -150,13 +174,19 @@ public class AgNSIdentificationItemProvider extends ItemProviderAdapter implemen * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSdescItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSdescItemProvider.java index 8d4e509824a77cf42ee30d950d44d10e36928780..fdd82044a7a6f7d02258ee906839d9dfccc9a47e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSdescItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSdescItemProvider.java @@ -84,11 +84,17 @@ public class AgNSdescItemProvider extends ItemProviderAdapter implements IEditin protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSdesc_descID_feature" ), + getResourceLocator(), + getString( "_UI_AgNSdesc_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSdesc_descID_feature", "_UI_AgNSdesc_type" ), - NsdPackage.Literals.AG_NSDESC__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NSDESC__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionDerivedStatisticsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionDerivedStatisticsItemProvider.java index 6f3495a8ffb081b28bc7f43f4bf1b53677f92720..ed7308f07b425ab7f9e6a8110707f7c78460eb38 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionDerivedStatisticsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionDerivedStatisticsItemProvider.java @@ -85,14 +85,20 @@ public class AgPresenceConditionDerivedStatisticsItemProvider extends ItemProvid * @generated */ protected void addDsPresCondPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -102,14 +108,20 @@ public class AgPresenceConditionDerivedStatisticsItemProvider extends ItemProvid * @generated */ protected void addDsPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -119,14 +131,20 @@ public class AgPresenceConditionDerivedStatisticsItemProvider extends ItemProvid * @generated */ protected void addDsPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionItemProvider.java index 2a4b9f5c7e56201aba1c6a4f81e4eba2747100f5..3744fa123773cbd658e8341698f0e1c7d5d44077 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgPresenceConditionItemProvider.java @@ -86,11 +86,17 @@ public class AgPresenceConditionItemProvider extends ItemProviderAdapter impleme protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -100,13 +106,19 @@ public class AgPresenceConditionItemProvider extends ItemProviderAdapter impleme * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -116,13 +128,19 @@ public class AgPresenceConditionItemProvider extends ItemProviderAdapter impleme * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgTrgOpItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgTrgOpItemProvider.java index 15797bc85826b28dd7c37ffdf70cf0110ff902d3..41d375a619c633c6e1e071eb03a01da0e0f08372 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgTrgOpItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgTrgOpItemProvider.java @@ -86,11 +86,17 @@ public class AgTrgOpItemProvider extends ItemProviderAdapter implements IEditing protected void addDchgPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_dchg_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_dchg_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_dchg_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__DCHG, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__DCHG, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -102,11 +108,17 @@ public class AgTrgOpItemProvider extends ItemProviderAdapter implements IEditing protected void addDupdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_dupd_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_dupd_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_dupd_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__DUPD, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__DUPD, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -118,11 +130,17 @@ public class AgTrgOpItemProvider extends ItemProviderAdapter implements IEditing protected void addQchgPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_qchg_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_qchg_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_qchg_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__QCHG, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__QCHG, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUMLItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUMLItemProvider.java index 492b93a66f407b6cdc80524230f2a5319029356a..4bbfee005ea417c9b09f1b9aad6ad21d1af868ba 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUMLItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUMLItemProvider.java @@ -87,11 +87,17 @@ public class AgUMLItemProvider extends ItemProviderAdapter implements IEditingDo protected void addUmlDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlDate_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlDate_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlDate_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -103,11 +109,17 @@ public class AgUMLItemProvider extends ItemProviderAdapter implements IEditingDo protected void addUmlVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlVersion_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlVersion_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlVersion_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUnderlyingTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUnderlyingTypeItemProvider.java index 9150789a1d589c4e27c076e82b7e3ce69a4b294b..b7bf4a03ca25b2516e9172fa291787916284f9ba 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUnderlyingTypeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUnderlyingTypeItemProvider.java @@ -85,11 +85,17 @@ public class AgUnderlyingTypeItemProvider extends ItemProviderAdapter implements protected void addUnderlyingTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUnderlyingType_underlyingType_feature" ), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingType_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingType_feature", "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -99,13 +105,19 @@ public class AgUnderlyingTypeItemProvider extends ItemProviderAdapter implements * @generated */ protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingTypeKind_feature", - "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgUnderlyingType_underlyingTypeKind_feature", "_UI_AgUnderlyingType_type" ), + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java index 46731a93e2ebe6c147380ba7fa8f4cee3a129f79..12dce3045630fbcc8e093cac2307c1776b95871b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AnyLNClassItemProvider.java @@ -79,11 +79,17 @@ public class AnyLNClassItemProvider extends TitledClassItemProvider { protected void addBasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AnyLNClass_base_feature" ), + getResourceLocator(), + getString( "_UI_AnyLNClass_base_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AnyLNClass_base_feature", "_UI_AnyLNClass_type" ), - NsdPackage.Literals.ANY_LN_CLASS__BASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ANY_LN_CLASS__BASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -93,12 +99,19 @@ public class AnyLNClassItemProvider extends TitledClassItemProvider { * @generated */ protected void addRefersToAbstractLNClassPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AnyLNClass_refersToAbstractLNClass_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AnyLNClass_refersToAbstractLNClass_feature", - "_UI_AnyLNClass_type" ), - NsdPackage.Literals.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AnyLNClass_refersToAbstractLNClass_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AnyLNClass_refersToAbstractLNClass_feature", "_UI_AnyLNClass_type" ), + NsdPackage.Literals.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java index 157af5d9bbc4d477cfe0ab704f89462f2a5a82eb..8dbf05250bc2b86fcf5b6130a68c2cbd34f6536f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ApplicableServiceNSItemProvider.java @@ -78,11 +78,17 @@ public class ApplicableServiceNSItemProvider extends CopyrightedItemProvider { protected void addDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ApplicableServiceNS_date_feature" ), + getResourceLocator(), + getString( "_UI_ApplicableServiceNS_date_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ApplicableServiceNS_date_feature", "_UI_ApplicableServiceNS_type" ), - NsdPackage.Literals.APPLICABLE_SERVICE_NS__DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.APPLICABLE_SERVICE_NS__DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -94,11 +100,17 @@ public class ApplicableServiceNSItemProvider extends CopyrightedItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ApplicableServiceNS_version_feature" ), + getResourceLocator(), + getString( "_UI_ApplicableServiceNS_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ApplicableServiceNS_version_feature", "_UI_ApplicableServiceNS_type" ), - NsdPackage.Literals.APPLICABLE_SERVICE_NS__VERSION, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.APPLICABLE_SERVICE_NS__VERSION, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java index 0ebd47951002fac76a4db1d87909fe71f6c07a6f..b9d09f47042750b65d9bc8c351507d5a26874e82 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AppliesToTypeItemProvider.java @@ -78,11 +78,17 @@ public class AppliesToTypeItemProvider extends NsdObjectItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -94,11 +100,17 @@ public class AppliesToTypeItemProvider extends NsdObjectItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -110,11 +122,17 @@ public class AppliesToTypeItemProvider extends NsdObjectItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -126,11 +144,17 @@ public class AppliesToTypeItemProvider extends NsdObjectItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -140,13 +164,19 @@ public class AppliesToTypeItemProvider extends NsdObjectItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java index 9f82acfa05ccbb941a469619ec276e4e0fd89578..12d91ab261fd4b0a5a3720f4666d2e6ef4e18f85 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/BasicTypeItemProvider.java @@ -76,11 +76,17 @@ public class BasicTypeItemProvider extends NsdObjectItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_BasicType_descID_feature" ), + getResourceLocator(), + getString( "_UI_BasicType_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_BasicType_descID_feature", "_UI_BasicType_type" ), - NsdPackage.Literals.BASIC_TYPE__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.BASIC_TYPE__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -92,11 +98,17 @@ public class BasicTypeItemProvider extends NsdObjectItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_BasicType_name_feature" ), + getResourceLocator(), + getString( "_UI_BasicType_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_BasicType_name_feature", "_UI_BasicType_type" ), - NsdPackage.Literals.BASIC_TYPE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.BASIC_TYPE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -106,12 +118,19 @@ public class BasicTypeItemProvider extends NsdObjectItemProvider { * @generated */ protected void addReferredByDataAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_BasicType_referredByDataAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_BasicType_referredByDataAttribute_feature", - "_UI_BasicType_type" ), - NsdPackage.Literals.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_BasicType_referredByDataAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_BasicType_referredByDataAttribute_feature", "_UI_BasicType_type" ), + NsdPackage.Literals.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java index 37f9ea2dc4a663876c21f466ecced20a77438a0d..9e68e34a1d82b72e2d57b8e5730477ae03bb99ac 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCItemProvider.java @@ -84,11 +84,17 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addEnumParameterizedPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_enumParameterized_feature" ), + getResourceLocator(), + getString( "_UI_CDC_enumParameterized_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_enumParameterized_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__ENUM_PARAMETERIZED, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CDC__ENUM_PARAMETERIZED, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -100,10 +106,16 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_name_feature" ), + getResourceLocator(), + getString( "_UI_CDC_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_name_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null ) ); + NsdPackage.Literals.CDC__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -115,10 +127,16 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addStatisticsPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_statistics_feature" ), + getResourceLocator(), + getString( "_UI_CDC_statistics_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_statistics_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__STATISTICS, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CDC__STATISTICS, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -130,11 +148,17 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addTypeKindParameterizedPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_typeKindParameterized_feature" ), + getResourceLocator(), + getString( "_UI_CDC_typeKindParameterized_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_typeKindParameterized_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__TYPE_KIND_PARAMETERIZED, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CDC__TYPE_KIND_PARAMETERIZED, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -146,10 +170,16 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addVariantPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_variant_feature" ), + getResourceLocator(), + getString( "_UI_CDC_variant_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_variant_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__VARIANT, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CDC__VARIANT, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -161,10 +191,17 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addReferredByDataObjectPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_referredByDataObject_feature" ), + getResourceLocator(), + getString( "_UI_CDC_referredByDataObject_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_referredByDataObject_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__REFERRED_BY_DATA_OBJECT, true, false, true, null, null, null ) ); + NsdPackage.Literals.CDC__REFERRED_BY_DATA_OBJECT, + true, + false, + true, + null, + null, + null ) ); } /** @@ -176,10 +213,17 @@ public class CDCItemProvider extends TitledClassItemProvider { protected void addReferredBySubDataObjectPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_CDC_referredBySubDataObject_feature" ), + getResourceLocator(), + getString( "_UI_CDC_referredBySubDataObject_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_CDC_referredBySubDataObject_feature", "_UI_CDC_type" ), - NsdPackage.Literals.CDC__REFERRED_BY_SUB_DATA_OBJECT, true, false, true, null, null, null ) ); + NsdPackage.Literals.CDC__REFERRED_BY_SUB_DATA_OBJECT, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java index 386a6f3eb972593128fdd8026f762024411b403a..2b6c448eb957cb0db3cc95ae3b8c171951039e69 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/CDCsItemProvider.java @@ -147,8 +147,8 @@ public class CDCsItemProvider extends NsdObjectItemProvider { protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) { super.collectNewChildDescriptors( newChildDescriptors, object ); - newChildDescriptors - .add( createChildParameter( NsdPackage.Literals.CD_CS__CDC, NsdFactory.eINSTANCE.createCDC() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.CD_CS__CDC, + NsdFactory.eINSTANCE.createCDC() ) ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java index 97c56fbb8e13d432bec7a43a4123705d174d6b7d..c444ca218f87a453753d48ce29664d155895d680 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ChangesItemProvider.java @@ -79,11 +79,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addChangesIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_changesID_feature" ), + getResourceLocator(), + getString( "_UI_Changes_changesID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_changesID_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__CHANGES_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__CHANGES_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -95,11 +101,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_date_feature" ), + getResourceLocator(), + getString( "_UI_Changes_date_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_date_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -111,11 +123,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_revision_feature" ), + getResourceLocator(), + getString( "_UI_Changes_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_revision_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -127,11 +145,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addTissuesPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_tissues_feature" ), + getResourceLocator(), + getString( "_UI_Changes_tissues_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_tissues_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__TISSUES, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__TISSUES, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -143,11 +167,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_release_feature" ), + getResourceLocator(), + getString( "_UI_Changes_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_release_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -159,11 +189,17 @@ public class ChangesItemProvider extends NsdObjectItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Changes_version_feature" ), + getResourceLocator(), + getString( "_UI_Changes_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Changes_version_feature", "_UI_Changes_type" ), - NsdPackage.Literals.CHANGES__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CHANGES__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java index c4e6523654982d6e7c367a9efbfb72b704019839..a9098c28f376343c60e71ce1e066190388ee4631 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ConstructedAttributeItemProvider.java @@ -78,11 +78,17 @@ public class ConstructedAttributeItemProvider extends TitledClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ConstructedAttribute_name_feature" ), + getResourceLocator(), + getString( "_UI_ConstructedAttribute_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ConstructedAttribute_name_feature", "_UI_ConstructedAttribute_type" ), - NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java index 0a4afd71c66167d11d32955b9b419716b8ba8a40..47afe21d7af59e20891513d0376cc504147cc29d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataAttributeItemProvider.java @@ -100,11 +100,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addDchgPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_dchg_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_dchg_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_dchg_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__DCHG, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__DCHG, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -115,12 +121,18 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { */ protected void addDefaultValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_defaultValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_defaultValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -132,11 +144,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addDupdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_dupd_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_dupd_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_dupd_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__DUPD, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__DUPD, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -148,11 +166,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addFcPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataAttribute_fc_feature" ), + getResourceLocator(), + getString( "_UI_DataAttribute_fc_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_fc_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__FC, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_ATTRIBUTE__FC, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -164,11 +188,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addIsArrayPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_isArray_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_isArray_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_isArray_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__IS_ARRAY, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__IS_ARRAY, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -180,11 +210,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMaxIndexAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_maxIndexAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_maxIndexAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_maxIndexAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -196,11 +232,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMaxValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_maxValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -212,11 +254,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMinIndexPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_minIndex_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_minIndex_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_minIndex_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MIN_INDEX, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MIN_INDEX, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -228,11 +276,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMinValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_minValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -244,11 +298,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataAttribute_name_feature" ), + getResourceLocator(), + getString( "_UI_DataAttribute_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_name_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_ATTRIBUTE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -259,12 +319,18 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { */ protected void addReferredBySubDataObjectAsSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_DataAttribute_referredBySubDataObjectAsSizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_referredBySubDataObjectAsSizeAttribute_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_SUB_DATA_OBJECT_AS_SIZE_ATTRIBUTE, true, false, true, - null, null, null ) ); + NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_SUB_DATA_OBJECT_AS_SIZE_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -274,14 +340,20 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addReferredBySubDataObjectAsMaxIndexAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataAttribute_referredBySubDataObjectAsMaxIndexAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_DataAttribute_referredBySubDataObjectAsMaxIndexAttribute_feature", - "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_SUB_DATA_OBJECT_AS_MAX_INDEX_ATTRIBUTE, true, false, - true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataAttribute_referredBySubDataObjectAsMaxIndexAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataAttribute_referredBySubDataObjectAsMaxIndexAttribute_feature", + "_UI_DataAttribute_type" ), + NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_SUB_DATA_OBJECT_AS_MAX_INDEX_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -293,11 +365,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addRefersToFunctionalConstraintPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataAttribute_refersToFunctionalConstraint_feature" ), + getResourceLocator(), + getString( "_UI_DataAttribute_refersToFunctionalConstraint_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_refersToFunctionalConstraint_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, true, false, true, null, - null, null ) ); + NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, + true, + false, + true, + null, + null, + null ) ); } /** @@ -307,13 +385,19 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToPresenceConditionPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataAttribute_refersToPresenceCondition_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_refersToPresenceCondition_feature", - "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataAttribute_refersToPresenceCondition_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataAttribute_refersToPresenceCondition_feature", "_UI_DataAttribute_type" ), + NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, + true, + false, + true, + null, + null, + null ) ); } /** @@ -323,12 +407,19 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToSizeAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataAttribute_refersToSizeAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_refersToSizeAttribute_feature", - "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataAttribute_refersToSizeAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataAttribute_refersToSizeAttribute_feature", "_UI_DataAttribute_type" ), + NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -338,13 +429,19 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToMaxIndexAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataAttribute_refersToMaxIndexAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_refersToMaxIndexAttribute_feature", - "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataAttribute_refersToMaxIndexAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataAttribute_refersToMaxIndexAttribute_feature", "_UI_DataAttribute_type" ), + NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -355,12 +452,18 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { */ protected void addReferredByDataAttributeAsSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_DataAttribute_referredByDataAttributeAsSizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_referredByDataAttributeAsSizeAttribute_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_DATA_ATTRIBUTE_AS_SIZE_ATTRIBUTE, true, false, true, - null, null, null ) ); + NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_DATA_ATTRIBUTE_AS_SIZE_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -370,14 +473,20 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addReferredByDataAttributeAsMaxIndexAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataAttribute_referredByDataAttributeAsMaxIndexAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_DataAttribute_referredByDataAttributeAsMaxIndexAttribute_feature", - "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_DATA_ATTRIBUTE_AS_MAX_INDEX_ATTRIBUTE, true, false, - true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataAttribute_referredByDataAttributeAsMaxIndexAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataAttribute_referredByDataAttributeAsMaxIndexAttribute_feature", + "_UI_DataAttribute_type" ), + NsdPackage.Literals.DATA_ATTRIBUTE__REFERRED_BY_DATA_ATTRIBUTE_AS_MAX_INDEX_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -389,10 +498,16 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addRefersToBasicTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataAttribute_refersToBasicType_feature" ), + getResourceLocator(), + getString( "_UI_DataAttribute_refersToBasicType_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataAttribute_refersToBasicType_feature", "_UI_DataAttribute_type" ), - NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_BASIC_TYPE, true, false, true, null, null, + NsdPackage.Literals.DATA_ATTRIBUTE__REFERS_TO_BASIC_TYPE, + true, + false, + true, + null, + null, null ) ); } @@ -405,11 +520,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -419,13 +540,19 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -435,13 +562,19 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -453,11 +586,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addQchgPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgTrgOp_qchg_feature" ), + getResourceLocator(), + getString( "_UI_AgTrgOp_qchg_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgTrgOp_qchg_feature", "_UI_AgTrgOp_type" ), - NsdPackage.Literals.AG_TRG_OP__QCHG, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_TRG_OP__QCHG, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -469,11 +608,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_sizeAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_sizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_sizeAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -485,11 +630,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_type_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_type_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -501,11 +652,17 @@ public class DataAttributeItemProvider extends DocumentedClassItemProvider { protected void addTypeKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_typeKind_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_typeKind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_typeKind_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java index bdb52ecace53bb24c8c49aa1187d3adb3ef55ed5..1244b906c27ff50e1055dc487a2c5cdf6625c144 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataObjectItemProvider.java @@ -86,14 +86,20 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addDsPresCondPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCond_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -103,14 +109,20 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addDsPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgs_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -120,14 +132,20 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addDsPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature", - "_UI_AgPresenceConditionDerivedStatistics_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceConditionDerivedStatistics_dsPresCondArgsID_feature", + "_UI_AgPresenceConditionDerivedStatistics_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -139,11 +157,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataObject_name_feature" ), + getResourceLocator(), + getString( "_UI_DataObject_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_name_feature", "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_OBJECT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -155,11 +179,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -169,13 +199,19 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -185,13 +221,19 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -203,11 +245,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addTransientPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataObject_transient_feature" ), + getResourceLocator(), + getString( "_UI_DataObject_transient_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_transient_feature", "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__TRANSIENT, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_OBJECT__TRANSIENT, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -219,11 +267,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataObject_type_feature" ), + getResourceLocator(), + getString( "_UI_DataObject_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_type_feature", "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_OBJECT__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -235,10 +289,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addRefersToCDCPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataObject_refersToCDC_feature" ), + getResourceLocator(), + getString( "_UI_DataObject_refersToCDC_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_refersToCDC_feature", "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__REFERS_TO_CDC, true, false, true, null, null, null ) ); + NsdPackage.Literals.DATA_OBJECT__REFERS_TO_CDC, + true, + false, + true, + null, + null, + null ) ); } /** @@ -248,12 +309,19 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToPresenceConditionPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_DataObject_refersToPresenceCondition_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_refersToPresenceCondition_feature", - "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_DataObject_refersToPresenceCondition_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_DataObject_refersToPresenceCondition_feature", "_UI_DataObject_type" ), + NsdPackage.Literals.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, + true, + false, + true, + null, + null, + null ) ); } /** @@ -264,12 +332,18 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { */ protected void addRefersToPresenceConditionDerivedStatisticsPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_DataObject_refersToPresenceConditionDerivedStatistics_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataObject_refersToPresenceConditionDerivedStatistics_feature", "_UI_DataObject_type" ), - NsdPackage.Literals.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, true, false, true, - null, null, null ) ); + NsdPackage.Literals.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, + true, + false, + true, + null, + null, + null ) ); } /** @@ -281,11 +355,17 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { protected void addUnderlyingTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUnderlyingType_underlyingType_feature" ), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingType_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingType_feature", "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -295,13 +375,19 @@ public class DataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingTypeKind_feature", - "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgUnderlyingType_underlyingTypeKind_feature", "_UI_AgUnderlyingType_type" ), + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java index 4d754d7e4a81d660f35322d4454243c44954f118..654974ec03df157230811844251b040ab55f93ce 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DataSetMemberOfItemProvider.java @@ -74,11 +74,17 @@ public class DataSetMemberOfItemProvider extends NsdObjectItemProvider { protected void addCbPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DataSetMemberOf_cb_feature" ), + getResourceLocator(), + getString( "_UI_DataSetMemberOf_cb_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DataSetMemberOf_cb_feature", "_UI_DataSetMemberOf_type" ), - NsdPackage.Literals.DATA_SET_MEMBER_OF__CB, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DATA_SET_MEMBER_OF__CB, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnItemProvider.java index 3caa128f85306fee1c3b32d6d8dc2703714ea27b..76c365b3cf29de1105dfcf87c98ab5d72a51a234 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DependsOnItemProvider.java @@ -78,11 +78,17 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -94,11 +100,17 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -110,11 +122,17 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -126,11 +144,17 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -140,13 +164,19 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -158,10 +188,17 @@ public class DependsOnItemProvider extends NsdObjectItemProvider { protected void addRefersToNSPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DependsOn_refersToNS_feature" ), + getResourceLocator(), + getString( "_UI_DependsOn_refersToNS_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DependsOn_refersToNS_feature", "_UI_DependsOn_type" ), - NsdPackage.Literals.DEPENDS_ON__REFERS_TO_NS, true, false, true, null, null, null ) ); + NsdPackage.Literals.DEPENDS_ON__REFERS_TO_NS, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java index 85c66de4d4cc169121f2228243dcaeadce5fe953..3e64233764955c72cc0ac7b98acd400d689f589f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocItemProvider.java @@ -83,10 +83,16 @@ public class DocItemProvider extends NsdObjectItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Doc_id_feature" ), + getResourceLocator(), + getString( "_UI_Doc_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Doc_id_feature", "_UI_Doc_type" ), - NsdPackage.Literals.DOC__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null ) ); + NsdPackage.Literals.DOC__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -177,30 +183,36 @@ public class DocItemProvider extends NsdObjectItemProvider { super.collectNewChildDescriptors( newChildDescriptors, object ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION, XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil.createEntry( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS, NsdFactory.eINSTANCE.createApplicableServiceNS() ) ) ); - newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil - .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createNS() ) ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, + FeatureMapUtil.createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS, + NsdFactory.eINSTANCE.createNS() ) ) ); - newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil - .createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, NsdFactory.eINSTANCE.createNSDoc() ) ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, + FeatureMapUtil.createEntry( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, + NsdFactory.eINSTANCE.createNSDoc() ) ) ); - newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, FeatureMapUtil.createEntry( - NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, NsdFactory.eINSTANCE.createServiceNS() ) ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOC__MIXED, + FeatureMapUtil.createEntry( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, + NsdFactory.eINSTANCE.createServiceNS() ) ) ); } /** @@ -221,10 +233,10 @@ public class DocItemProvider extends NsdObjectItemProvider { childObject = entry.getValue(); } - boolean qualify = childFeature == NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS - || childFeature == NsdPackage.Literals.DOCUMENT_ROOT__NS - || childFeature == NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC - || childFeature == NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS; + boolean qualify = childFeature == NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS || + childFeature == NsdPackage.Literals.DOCUMENT_ROOT__NS || + childFeature == NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC || + childFeature == NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS; if( qualify ) { return getString( "_UI_CreateChild_text2", diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java index fafd0744a0121f758d3683973ab4c201d75e7522..fa7cbb437930dbfa9ca1c30735dc797f95b47275 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentRootItemProvider.java @@ -166,11 +166,11 @@ public class DocumentRootItemProvider extends ItemProviderAdapter implements IEd newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__APPLICABLE_SERVICE_NS, NsdFactory.eINSTANCE.createApplicableServiceNS() ) ); - newChildDescriptors - .add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS, NsdFactory.eINSTANCE.createNS() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS, + NsdFactory.eINSTANCE.createNS() ) ); - newChildDescriptors.add( - createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, NsdFactory.eINSTANCE.createNSDoc() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__NS_DOC, + NsdFactory.eINSTANCE.createNSDoc() ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.DOCUMENT_ROOT__SERVICE_NS, NsdFactory.eINSTANCE.createServiceNS() ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java index 70ff2a27dffbb3ee04d3ad7bf03daa15524e9715..4ee5549add7c34799da46a7d92efccc9c759bfac 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/DocumentedClassItemProvider.java @@ -76,11 +76,17 @@ public class DocumentedClassItemProvider extends NsdObjectItemProvider { protected void addDeprecatedPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DocumentedClass_deprecated_feature" ), + getResourceLocator(), + getString( "_UI_DocumentedClass_deprecated_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_deprecated_feature", "_UI_DocumentedClass_type" ), - NsdPackage.Literals.DOCUMENTED_CLASS__DEPRECATED, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DOCUMENTED_CLASS__DEPRECATED, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -92,11 +98,17 @@ public class DocumentedClassItemProvider extends NsdObjectItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DocumentedClass_descID_feature" ), + getResourceLocator(), + getString( "_UI_DocumentedClass_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_descID_feature", "_UI_DocumentedClass_type" ), - NsdPackage.Literals.DOCUMENTED_CLASS__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DOCUMENTED_CLASS__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -108,11 +120,17 @@ public class DocumentedClassItemProvider extends NsdObjectItemProvider { protected void addInformativePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_DocumentedClass_informative_feature" ), + getResourceLocator(), + getString( "_UI_DocumentedClass_informative_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_DocumentedClass_informative_feature", "_UI_DocumentedClass_type" ), - NsdPackage.Literals.DOCUMENTED_CLASS__INFORMATIVE, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.DOCUMENTED_CLASS__INFORMATIVE, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java index 4efe943c50f0c4484e48be01fb6adaa3537220c6..bec7be6d584e55b7e676fe525dbc7368d0827e2b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/EnumerationItemProvider.java @@ -81,11 +81,17 @@ public class EnumerationItemProvider extends TitledClassItemProvider { protected void addInheritedFromPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Enumeration_inheritedFrom_feature" ), + getResourceLocator(), + getString( "_UI_Enumeration_inheritedFrom_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_inheritedFrom_feature", "_UI_Enumeration_type" ), - NsdPackage.Literals.ENUMERATION__INHERITED_FROM, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ENUMERATION__INHERITED_FROM, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -97,11 +103,17 @@ public class EnumerationItemProvider extends TitledClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Enumeration_name_feature" ), + getResourceLocator(), + getString( "_UI_Enumeration_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_name_feature", "_UI_Enumeration_type" ), - NsdPackage.Literals.ENUMERATION__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.ENUMERATION__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -111,12 +123,19 @@ public class EnumerationItemProvider extends TitledClassItemProvider { * @generated */ protected void addRefersToBaseEnumerationPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_Enumeration_refersToBaseEnumeration_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_refersToBaseEnumeration_feature", - "_UI_Enumeration_type" ), - NsdPackage.Literals.ENUMERATION__REFERS_TO_BASE_ENUMERATION, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_Enumeration_refersToBaseEnumeration_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_Enumeration_refersToBaseEnumeration_feature", "_UI_Enumeration_type" ), + NsdPackage.Literals.ENUMERATION__REFERS_TO_BASE_ENUMERATION, + true, + false, + true, + null, + null, + null ) ); } /** @@ -126,13 +145,19 @@ public class EnumerationItemProvider extends TitledClassItemProvider { * @generated */ protected void addReferredByEnumerationAsBasePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_Enumeration_referredByEnumerationAsBase_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_Enumeration_referredByEnumerationAsBase_feature", - "_UI_Enumeration_type" ), - NsdPackage.Literals.ENUMERATION__REFERRED_BY_ENUMERATION_AS_BASE, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_Enumeration_referredByEnumerationAsBase_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_Enumeration_referredByEnumerationAsBase_feature", "_UI_Enumeration_type" ), + NsdPackage.Literals.ENUMERATION__REFERRED_BY_ENUMERATION_AS_BASE, + true, + false, + true, + null, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java index 3ac839604c7d37dd1877627ec82e9b927f8540c6..ceec1ddc9df4ae551566460e3a13da80398bed0c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/FunctionalConstraintItemProvider.java @@ -78,13 +78,19 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { * @generated */ protected void addAbbreviationPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_FunctionalConstraint_abbreviation_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_abbreviation_feature", - "_UI_FunctionalConstraint_type" ), - NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__ABBREVIATION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_FunctionalConstraint_abbreviation_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_FunctionalConstraint_abbreviation_feature", "_UI_FunctionalConstraint_type" ), + NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__ABBREVIATION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -96,11 +102,17 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_FunctionalConstraint_descID_feature" ), + getResourceLocator(), + getString( "_UI_FunctionalConstraint_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_descID_feature", "_UI_FunctionalConstraint_type" ), - NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -112,11 +124,17 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { protected void addTitleIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_FunctionalConstraint_titleID_feature" ), + getResourceLocator(), + getString( "_UI_FunctionalConstraint_titleID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_titleID_feature", "_UI_FunctionalConstraint_type" ), - NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__TITLE_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__TITLE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -127,11 +145,17 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { */ protected void addReferredByDataAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_FunctionalConstraint_referredByDataAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_referredByDataAttribute_feature", "_UI_FunctionalConstraint_type" ), - NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__REFERRED_BY_DATA_ATTRIBUTE, true, false, true, null, null, + NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__REFERRED_BY_DATA_ATTRIBUTE, + true, + false, + true, + null, + null, null ) ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java index 0c07a0b26c5dec34d18b7fdbecbcf3bb2cbac292..5c9c411afdf9d6f27f69e2e57c70d3f53cbb293e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LNClassItemProvider.java @@ -77,11 +77,17 @@ public class LNClassItemProvider extends AnyLNClassItemProvider { protected void addCanHaveLOGPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_LNClass_canHaveLOG_feature" ), + getResourceLocator(), + getString( "_UI_LNClass_canHaveLOG_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_canHaveLOG_feature", "_UI_LNClass_type" ), - NsdPackage.Literals.LN_CLASS__CAN_HAVE_LOG, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LN_CLASS__CAN_HAVE_LOG, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -93,11 +99,17 @@ public class LNClassItemProvider extends AnyLNClassItemProvider { protected void addIsExtensionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_LNClass_isExtension_feature" ), + getResourceLocator(), + getString( "_UI_LNClass_isExtension_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_isExtension_feature", "_UI_LNClass_type" ), - NsdPackage.Literals.LN_CLASS__IS_EXTENSION, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LN_CLASS__IS_EXTENSION, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -109,11 +121,17 @@ public class LNClassItemProvider extends AnyLNClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_LNClass_name_feature" ), + getResourceLocator(), + getString( "_UI_LNClass_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_LNClass_name_feature", "_UI_LNClass_type" ), - NsdPackage.Literals.LN_CLASS__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LN_CLASS__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java index 52b41a636f1a2724942eee6742854628b6abaebd..38bb96269187387d1bc769c88ea78dbe4fbcb5e4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LicenseItemProvider.java @@ -82,11 +82,17 @@ public class LicenseItemProvider extends NsdObjectItemProvider { protected void addKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_License_kind_feature" ), + getResourceLocator(), + getString( "_UI_License_kind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_License_kind_feature", "_UI_License_type" ), - NsdPackage.Literals.LICENSE__KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LICENSE__KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -98,11 +104,17 @@ public class LicenseItemProvider extends NsdObjectItemProvider { protected void addUriPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_License_uri_feature" ), + getResourceLocator(), + getString( "_UI_License_uri_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_License_uri_feature", "_UI_License_type" ), - NsdPackage.Literals.LICENSE__URI, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LICENSE__URI, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -193,17 +205,20 @@ public class LicenseItemProvider extends NsdObjectItemProvider { super.collectNewChildDescriptors( newChildDescriptors, object ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED, FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION, XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.LICENSE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, + "" ) ) ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java index d3e9fbe71a9595f121a22505c79811ff8641552b..74b0372be417e5c2263922593e8d3ed6270b4a78 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/LiteralItemProvider.java @@ -76,11 +76,17 @@ public class LiteralItemProvider extends DocumentedClassItemProvider { protected void addLiteralValPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Literal_literalVal_feature" ), + getResourceLocator(), + getString( "_UI_Literal_literalVal_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Literal_literalVal_feature", "_UI_Literal_type" ), - NsdPackage.Literals.LITERAL__LITERAL_VAL, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LITERAL__LITERAL_VAL, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -92,11 +98,17 @@ public class LiteralItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_Literal_name_feature" ), + getResourceLocator(), + getString( "_UI_Literal_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_Literal_name_feature", "_UI_Literal_type" ), - NsdPackage.Literals.LITERAL__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.LITERAL__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDEditPlugin.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDEditPlugin.java index 6668aad8fa586f03e2be6698497b9ab0e6816587..568deed8ccbe176f9f81b1c8e4bea6022f0ba396 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDEditPlugin.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDEditPlugin.java @@ -53,7 +53,8 @@ public final class NSDEditPlugin extends EMFPlugin { * @generated */ public NSDEditPlugin() { - super( new ResourceLocator[] {} ); + super( new ResourceLocator[] { + } ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java index f5162cbb3c7906438e395f979151d2f95b6448f3..743d2e44c6ee62c1b8007d09e340260860a03f45 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSDocItemProvider.java @@ -85,11 +85,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -101,10 +107,16 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addLangPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_NSDoc_lang_feature" ), + getResourceLocator(), + getString( "_UI_NSDoc_lang_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_NSDoc_lang_feature", "_UI_NSDoc_type" ), - NsdPackage.Literals.NS_DOC__LANG, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.NS_DOC__LANG, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -114,13 +126,19 @@ public class NSDocItemProvider extends CopyrightedItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -132,11 +150,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -148,11 +172,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -164,11 +194,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addUmlDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlDate_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlDate_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlDate_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -180,11 +216,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addUmlVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlVersion_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlVersion_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlVersion_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -196,11 +238,17 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -297,8 +345,8 @@ public class NSDocItemProvider extends CopyrightedItemProvider { protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) { super.collectNewChildDescriptors( newChildDescriptors, object ); - newChildDescriptors - .add( createChildParameter( NsdPackage.Literals.NS_DOC__DOC, NsdFactory.eINSTANCE.createDoc() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS_DOC__DOC, + NsdFactory.eINSTANCE.createDoc() ) ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java index 1898b06883846fdbc50217ecddbf9bdf7365362c..a94fd7cb9edba7911a79295e59487f87bbc7879e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NSItemProvider.java @@ -86,11 +86,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSdesc_descID_feature" ), + getResourceLocator(), + getString( "_UI_AgNSdesc_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSdesc_descID_feature", "_UI_AgNSdesc_type" ), - NsdPackage.Literals.AG_NSDESC__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NSDESC__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -102,10 +108,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addReferredByDependsOnPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_NS_referredByDependsOn_feature" ), + getResourceLocator(), + getString( "_UI_NS_referredByDependsOn_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_NS_referredByDependsOn_feature", "_UI_NS_type" ), - NsdPackage.Literals.NS__REFERRED_BY_DEPENDS_ON, true, false, true, null, null, null ) ); + NsdPackage.Literals.NS__REFERRED_BY_DEPENDS_ON, + true, + false, + true, + null, + null, + null ) ); } /** @@ -117,11 +130,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -131,13 +150,19 @@ public class NSItemProvider extends CopyrightedItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -149,11 +174,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -165,11 +196,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -181,11 +218,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addUmlDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlDate_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlDate_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlDate_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -197,11 +240,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addUmlVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlVersion_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlVersion_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlVersion_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -213,11 +262,17 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -332,14 +387,14 @@ public class NSItemProvider extends CopyrightedItemProvider { protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) { super.collectNewChildDescriptors( newChildDescriptors, object ); - newChildDescriptors - .add( createChildParameter( NsdPackage.Literals.NS__CHANGES, NsdFactory.eINSTANCE.createChanges() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__CHANGES, + NsdFactory.eINSTANCE.createChanges() ) ); - newChildDescriptors.add( - createChildParameter( NsdPackage.Literals.NS__DEPENDS_ON, NsdFactory.eINSTANCE.createDependsOn() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__DEPENDS_ON, + NsdFactory.eINSTANCE.createDependsOn() ) ); - newChildDescriptors.add( - createChildParameter( NsdPackage.Literals.NS__BASIC_TYPES, NsdFactory.eINSTANCE.createBasicTypes() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__BASIC_TYPES, + NsdFactory.eINSTANCE.createBasicTypes() ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__FUNCTIONAL_CONSTRAINTS, NsdFactory.eINSTANCE.createFunctionalConstraints() ) ); @@ -356,11 +411,11 @@ public class NSItemProvider extends CopyrightedItemProvider { newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__CONSTRUCTED_ATTRIBUTES, NsdFactory.eINSTANCE.createConstructedAttributes() ) ); - newChildDescriptors - .add( createChildParameter( NsdPackage.Literals.NS__CD_CS, NsdFactory.eINSTANCE.createCDCs() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__CD_CS, + NsdFactory.eINSTANCE.createCDCs() ) ); - newChildDescriptors.add( - createChildParameter( NsdPackage.Literals.NS__LN_CLASSES, NsdFactory.eINSTANCE.createLNClasses() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NS__LN_CLASSES, + NsdFactory.eINSTANCE.createLNClasses() ) ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java index 9b7155c3a06b3fafe61d9c9a952b8c4880a7861d..c26ecb664a94a90dde50c5fb8261071af1f5583b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NoticeItemProvider.java @@ -152,17 +152,20 @@ public class NoticeItemProvider extends NsdObjectItemProvider { super.collectNewChildDescriptors( newChildDescriptors, object ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, + "" ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED, FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION, XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.NOTICE__MIXED, - FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, "" ) ) ); + FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, + "" ) ) ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdObjectItemProvider.java index c5b2479b024f91a2150796f5850f7c24ba2ee5b3..8e42ae3d4f4be9eb3060b0b39637875ed35d36a0 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdObjectItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/NsdObjectItemProvider.java @@ -85,11 +85,17 @@ public class NsdObjectItemProvider extends ItemProviderAdapter implements IEditi protected void addLineNumberPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_NsdObject_lineNumber_feature" ), + getResourceLocator(), + getString( "_UI_NsdObject_lineNumber_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_NsdObject_lineNumber_feature", "_UI_NsdObject_type" ), - NsdPackage.Literals.NSD_OBJECT__LINE_NUMBER, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.NSD_OBJECT__LINE_NUMBER, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -101,11 +107,17 @@ public class NsdObjectItemProvider extends ItemProviderAdapter implements IEditi protected void addExplicitLinksBuiltPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_NsdObject_explicitLinksBuilt_feature" ), + getResourceLocator(), + getString( "_UI_NsdObject_explicitLinksBuilt_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_NsdObject_explicitLinksBuilt_feature", "_UI_NsdObject_type" ), - NsdPackage.Literals.NSD_OBJECT__EXPLICIT_LINKS_BUILT, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.NSD_OBJECT__EXPLICIT_LINKS_BUILT, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java index 85c419f59cb8705c0746243d4772908359d9fd15..caef59fcdd8e1275b81f2fee14cc1e0c43778d85 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/PresenceConditionItemProvider.java @@ -82,11 +82,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addArgumentPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_argument_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_argument_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_argument_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__ARGUMENT, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__ARGUMENT, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -98,11 +104,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_descID_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_descID_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -114,11 +126,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_name_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_name_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -130,11 +148,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addTitleIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_titleID_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_titleID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_titleID_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__TITLE_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__TITLE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -144,13 +168,19 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { * @generated */ protected void addReferredByDataObjectPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_PresenceCondition_referredByDataObject_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_referredByDataObject_feature", - "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_OBJECT, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_PresenceCondition_referredByDataObject_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_PresenceCondition_referredByDataObject_feature", "_UI_PresenceCondition_type" ), + NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_OBJECT, + true, + false, + true, + null, + null, + null ) ); } /** @@ -160,14 +190,20 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { * @generated */ protected void addReferredByDataObjectForDerivedStatisticsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_PresenceCondition_referredByDataObjectForDerivedStatistics_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_PresenceCondition_referredByDataObjectForDerivedStatistics_feature", - "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_OBJECT_FOR_DERIVED_STATISTICS, true, false, - true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_PresenceCondition_referredByDataObjectForDerivedStatistics_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_PresenceCondition_referredByDataObjectForDerivedStatistics_feature", + "_UI_PresenceCondition_type" ), + NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_OBJECT_FOR_DERIVED_STATISTICS, + true, + false, + true, + null, + null, + null ) ); } /** @@ -179,11 +215,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addReferredBySubDataObjectPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_referredBySubDataObject_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_referredBySubDataObject_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_referredBySubDataObject_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_SUB_DATA_OBJECT, true, false, true, null, - null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_SUB_DATA_OBJECT, + true, + false, + true, + null, + null, + null ) ); } /** @@ -195,11 +237,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { protected void addReferredByDataAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_PresenceCondition_referredByDataAttribute_feature" ), + getResourceLocator(), + getString( "_UI_PresenceCondition_referredByDataAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_referredByDataAttribute_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_ATTRIBUTE, true, false, true, null, - null, null ) ); + NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_DATA_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -210,11 +258,17 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { */ protected void addReferredBySubDataAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_PresenceCondition_referredBySubDataAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_referredBySubDataAttribute_feature", "_UI_PresenceCondition_type" ), - NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_SUB_DATA_ATTRIBUTE, true, false, true, null, null, + NsdPackage.Literals.PRESENCE_CONDITION__REFERRED_BY_SUB_DATA_ATTRIBUTE, + true, + false, + true, + null, + null, null ) ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java index 5b1c1156985513f20565edb8cb9431fa8e52cdb8..5d7545fb3cd4b91f7e5d5083d25bf9f495b2bf67 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceCDCItemProvider.java @@ -78,11 +78,17 @@ public class ServiceCDCItemProvider extends NsdObjectItemProvider { protected void addCdcPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceCDC_cdc_feature" ), + getResourceLocator(), + getString( "_UI_ServiceCDC_cdc_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceCDC_cdc_feature", "_UI_ServiceCDC_type" ), - NsdPackage.Literals.SERVICE_CDC__CDC, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_CDC__CDC, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -94,11 +100,17 @@ public class ServiceCDCItemProvider extends NsdObjectItemProvider { protected void addVariantPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceCDC_variant_feature" ), + getResourceLocator(), + getString( "_UI_ServiceCDC_variant_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceCDC_variant_feature", "_UI_ServiceCDC_type" ), - NsdPackage.Literals.SERVICE_CDC__VARIANT, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_CDC__VARIANT, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java index abc4c1258fa5989af8b1ac8dc06d761af89cce09..684b05fdd6153413e598bbf243b0c85cdf7897de 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceConstructedAttributeItemProvider.java @@ -73,14 +73,20 @@ public class ServiceConstructedAttributeItemProvider extends ConstructedAttribut * @generated */ protected void addTypeKindParameterizedPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_ServiceConstructedAttribute_typeKindParameterized_feature" ), - getString( "_UI_PropertyDescriptor_description", - "_UI_ServiceConstructedAttribute_typeKindParameterized_feature", - "_UI_ServiceConstructedAttribute_type" ), - NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_ServiceConstructedAttribute_typeKindParameterized_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_ServiceConstructedAttribute_typeKindParameterized_feature", + "_UI_ServiceConstructedAttribute_type" ), + NsdPackage.Literals.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java index 0dab5828797d9a0be5ebf1b6ada9bce48535553d..3e796c799199a7ff51164907b38e80b15072c337 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceDataAttributeItemProvider.java @@ -83,11 +83,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addFcPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceDataAttribute_fc_feature" ), + getResourceLocator(), + getString( "_UI_ServiceDataAttribute_fc_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_fc_feature", "_UI_ServiceDataAttribute_type" ), - NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__FC, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__FC, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -99,11 +105,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceDataAttribute_name_feature" ), + getResourceLocator(), + getString( "_UI_ServiceDataAttribute_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceDataAttribute_name_feature", "_UI_ServiceDataAttribute_type" ), - NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -115,11 +127,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -129,13 +147,19 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -145,13 +169,19 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -163,11 +193,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_type_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_type_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -179,11 +215,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addTypeKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_typeKind_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_typeKind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_typeKind_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -195,11 +237,17 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide protected void addUnderlyingTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUnderlyingType_underlyingType_feature" ), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingType_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingType_feature", "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -209,13 +257,19 @@ public class ServiceDataAttributeItemProvider extends DocumentedClassItemProvide * @generated */ protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingTypeKind_feature", - "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgUnderlyingType_underlyingTypeKind_feature", "_UI_AgUnderlyingType_type" ), + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java index efea8eab7bed57088dca619afd7cb07f43c080b2..602c1e6f1fdbf93516d0bee96574f20150721d60 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNSItemProvider.java @@ -85,11 +85,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addDescIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSdesc_descID_feature" ), + getResourceLocator(), + getString( "_UI_AgNSdesc_descID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSdesc_descID_feature", "_UI_AgNSdesc_type" ), - NsdPackage.Literals.AG_NSDESC__DESC_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NSDESC__DESC_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -101,11 +107,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -115,13 +127,19 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -133,11 +151,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -149,11 +173,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -165,11 +195,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addUmlDatePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlDate_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlDate_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlDate_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_DATE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_DATE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -181,11 +217,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addUmlVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUML_umlVersion_feature" ), + getResourceLocator(), + getString( "_UI_AgUML_umlVersion_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_umlVersion_feature", "_UI_AgUML_type" ), - NsdPackage.Literals.AG_UML__UML_VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UML__UML_VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -197,11 +239,17 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -310,8 +358,8 @@ public class ServiceNSItemProvider extends CopyrightedItemProvider { protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) { super.collectNewChildDescriptors( newChildDescriptors, object ); - newChildDescriptors.add( - createChildParameter( NsdPackage.Literals.SERVICE_NS__CHANGES, NsdFactory.eINSTANCE.createChanges() ) ); + newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__CHANGES, + NsdFactory.eINSTANCE.createChanges() ) ); newChildDescriptors.add( createChildParameter( NsdPackage.Literals.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, NsdFactory.eINSTANCE.createFunctionalConstraints() ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java index e09f3cc697703950fcd6f0abca509b8cb4b4ff29..11d86e5f5531ad32706302f37e6c3a7265a06590 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceNsUsageItemProvider.java @@ -81,11 +81,17 @@ public class ServiceNsUsageItemProvider extends NsdObjectItemProvider { protected void addReleasePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_release_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_release_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_release_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__RELEASE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -97,11 +103,17 @@ public class ServiceNsUsageItemProvider extends NsdObjectItemProvider { protected void addVersionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_version_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_version_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_version_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__VERSION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -113,11 +125,17 @@ public class ServiceNsUsageItemProvider extends NsdObjectItemProvider { protected void addIdPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_id_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_id_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_id_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -127,13 +145,19 @@ public class ServiceNsUsageItemProvider extends NsdObjectItemProvider { * @generated */ protected void addPublicationStagePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgNSIdentification_publicationStage_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_publicationStage_feature", - "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgNSIdentification_publicationStage_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgNSIdentification_publicationStage_feature", "_UI_AgNSIdentification_type" ), + NsdPackage.Literals.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -145,11 +169,17 @@ public class ServiceNsUsageItemProvider extends NsdObjectItemProvider { protected void addRevisionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgNSIdentification_revision_feature" ), + getResourceLocator(), + getString( "_UI_AgNSIdentification_revision_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_revision_feature", "_UI_AgNSIdentification_type" ), - NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_NS_IDENTIFICATION__REVISION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java index 3dd7986f4a57f293c7d5ba053b12dc692238ce67..1aabf04dd44b745cfecb25674a55c68d0532f3ba 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceParameterItemProvider.java @@ -79,12 +79,18 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { */ protected void addDefaultValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_defaultValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_defaultValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -96,11 +102,17 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { protected void addMaxValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_maxValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -112,11 +124,17 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { protected void addMinValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_minValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -128,11 +146,17 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceParameter_name_feature" ), + getResourceLocator(), + getString( "_UI_ServiceParameter_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceParameter_name_feature", "_UI_ServiceParameter_type" ), - NsdPackage.Literals.SERVICE_PARAMETER__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_PARAMETER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -144,11 +168,17 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_type_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_type_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -160,11 +190,17 @@ public class ServiceParameterItemProvider extends DocumentedClassItemProvider { protected void addTypeKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_typeKind_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_typeKind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_typeKind_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java index 6526c37573838071fc22ae9902c645ad851190b8..9647e3d8ed279da8406dae4e6e9211ded1fbcbcd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/ServiceTypeItemProvider.java @@ -75,11 +75,17 @@ public class ServiceTypeItemProvider extends NsdObjectItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_ServiceType_name_feature" ), + getResourceLocator(), + getString( "_UI_ServiceType_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_ServiceType_name_feature", "_UI_ServiceType_type" ), - NsdPackage.Literals.SERVICE_TYPE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SERVICE_TYPE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java index 490b359a00db19222d1e34c33e73919d965fa41b..065407958b67ea3b79224bbca2daed319bba7a17 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataAttributeItemProvider.java @@ -87,12 +87,18 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { */ protected void addDefaultValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), + ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_defaultValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_defaultValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -104,11 +110,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addIsArrayPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_isArray_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_isArray_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_isArray_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__IS_ARRAY, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__IS_ARRAY, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -120,11 +132,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMaxIndexAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_maxIndexAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_maxIndexAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_maxIndexAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -136,11 +154,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMaxValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_maxValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_maxValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -152,11 +176,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMinIndexPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_minIndex_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_minIndex_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_minIndex_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MIN_INDEX, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MIN_INDEX, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -168,11 +198,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addMinValuePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeTypeAndValues_minValue_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeTypeAndValues_minValue_feature", "_UI_AgAttributeTypeAndValues_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -184,11 +220,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_SubDataAttribute_name_feature" ), + getResourceLocator(), + getString( "_UI_SubDataAttribute_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_name_feature", "_UI_SubDataAttribute_type" ), - NsdPackage.Literals.SUB_DATA_ATTRIBUTE__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SUB_DATA_ATTRIBUTE__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -200,11 +242,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addRefersToPresenceConditionPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_SubDataAttribute_refersToPresenceCondition_feature" ), + getResourceLocator(), + getString( "_UI_SubDataAttribute_refersToPresenceCondition_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_SubDataAttribute_refersToPresenceCondition_feature", "_UI_SubDataAttribute_type" ), - NsdPackage.Literals.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, true, false, true, null, - null, null ) ); + NsdPackage.Literals.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, + true, + false, + true, + null, + null, + null ) ); } /** @@ -216,11 +264,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -230,13 +284,19 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -246,13 +306,19 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -264,11 +330,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_sizeAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_sizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_sizeAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -280,11 +352,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_type_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_type_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -296,11 +374,17 @@ public class SubDataAttributeItemProvider extends DocumentedClassItemProvider { protected void addTypeKindPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgAttributeType_typeKind_feature" ), + getResourceLocator(), + getString( "_UI_AgAttributeType_typeKind_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgAttributeType_typeKind_feature", "_UI_AgAttributeType_type" ), - NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ATTRIBUTE_TYPE__TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java index adaab35a428fc652c82c6a2210e4333247dd4cd0..e67e95cb07ad4c944f6acce0fa53a88e06304cff 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/SubDataObjectItemProvider.java @@ -89,11 +89,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addIsArrayPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_isArray_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_isArray_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_isArray_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__IS_ARRAY, true, false, false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__IS_ARRAY, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null ) ); } /** @@ -105,11 +111,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addMaxIndexAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_maxIndexAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_maxIndexAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_maxIndexAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MAX_INDEX_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -121,11 +133,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addMinIndexPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_minIndex_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_minIndex_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_minIndex_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__MIN_INDEX, true, false, false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__MIN_INDEX, + true, + false, + false, + ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, + null, + null ) ); } /** @@ -137,11 +155,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addNamePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_SubDataObject_name_feature" ), + getResourceLocator(), + getString( "_UI_SubDataObject_name_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_name_feature", "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SUB_DATA_OBJECT__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -153,11 +177,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addPresCondPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgPresenceCondition_presCond_feature" ), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCond_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCond_feature", "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -167,13 +197,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgs_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgs_feature", + "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -183,13 +219,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addPresCondArgsIDPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgPresenceCondition_presCondArgsID_feature", - "_UI_AgPresenceCondition_type" ), - NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgPresenceCondition_presCondArgsID_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgPresenceCondition_presCondArgsID_feature", "_UI_AgPresenceCondition_type" ), + NsdPackage.Literals.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -201,11 +243,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addSizeAttributePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgArray_sizeAttribute_feature" ), + getResourceLocator(), + getString( "_UI_AgArray_sizeAttribute_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgArray_sizeAttribute_feature", "_UI_AgArray_type" ), - NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_ARRAY__SIZE_ATTRIBUTE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -217,11 +265,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_SubDataObject_type_feature" ), + getResourceLocator(), + getString( "_UI_SubDataObject_type_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_type_feature", "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.SUB_DATA_OBJECT__TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -233,10 +287,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addRefersToCDCPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_SubDataObject_refersToCDC_feature" ), + getResourceLocator(), + getString( "_UI_SubDataObject_refersToCDC_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_refersToCDC_feature", "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_CDC, true, false, true, null, null, null ) ); + NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_CDC, + true, + false, + true, + null, + null, + null ) ); } /** @@ -246,13 +307,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToPresenceConditionPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_SubDataObject_refersToPresenceCondition_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_refersToPresenceCondition_feature", - "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_SubDataObject_refersToPresenceCondition_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_SubDataObject_refersToPresenceCondition_feature", "_UI_SubDataObject_type" ), + NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, + true, + false, + true, + null, + null, + null ) ); } /** @@ -262,12 +329,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToSizeAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_SubDataObject_refersToSizeAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_refersToSizeAttribute_feature", - "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, true, false, true, null, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_SubDataObject_refersToSizeAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_SubDataObject_refersToSizeAttribute_feature", "_UI_SubDataObject_type" ), + NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -277,13 +351,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addRefersToMaxIndexAttributePropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_SubDataObject_refersToMaxIndexAttribute_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_SubDataObject_refersToMaxIndexAttribute_feature", - "_UI_SubDataObject_type" ), - NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, true, false, true, null, null, - null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_SubDataObject_refersToMaxIndexAttribute_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_SubDataObject_refersToMaxIndexAttribute_feature", "_UI_SubDataObject_type" ), + NsdPackage.Literals.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, + true, + false, + true, + null, + null, + null ) ); } /** @@ -295,11 +375,17 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { protected void addUnderlyingTypePropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_AgUnderlyingType_underlyingType_feature" ), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingType_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingType_feature", "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** @@ -309,13 +395,19 @@ public class SubDataObjectItemProvider extends DocumentedClassItemProvider { * @generated */ protected void addUnderlyingTypeKindPropertyDescriptor( Object object ) { - itemPropertyDescriptors.add( createItemPropertyDescriptor( - ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), getResourceLocator(), - getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), - getString( "_UI_PropertyDescriptor_description", "_UI_AgUnderlyingType_underlyingTypeKind_feature", - "_UI_AgUnderlyingType_type" ), - NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_AgUnderlyingType_underlyingTypeKind_feature" ), + getString( "_UI_PropertyDescriptor_description", + "_UI_AgUnderlyingType_underlyingTypeKind_feature", "_UI_AgUnderlyingType_type" ), + NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java index 4c6f887c8cf4617e77c4d61d0aa16af9d3a0fff2..bd8c60d5859861f55b3f7fa4118cac07091d2600 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/TitledClassItemProvider.java @@ -75,11 +75,17 @@ public class TitledClassItemProvider extends DocumentedClassItemProvider { protected void addTitleIDPropertyDescriptor( Object object ) { itemPropertyDescriptors.add( createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), - getResourceLocator(), getString( "_UI_TitledClass_titleID_feature" ), + getResourceLocator(), + getString( "_UI_TitledClass_titleID_feature" ), getString( "_UI_PropertyDescriptor_description", "_UI_TitledClass_titleID_feature", "_UI_TitledClass_type" ), - NsdPackage.Literals.TITLED_CLASS__TITLE_ID, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null ) ); + NsdPackage.Literals.TITLED_CLASS__TITLE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java index 12e088f466f822028ce37c55e9670d646a737f21..d6fa72a5105261e5ed5f7e6ccc90fae7ee1526aa 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/ACSIServicesKind.java @@ -1516,18 +1516,67 @@ public enum ACSIServicesKind implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final ACSIServicesKind[] VALUES_ARRAY = new ACSIServicesKind[] { ASSOCIATE, ABORT, RELEASE, - GET_SERVER_DIRECTORY, GET_LOGICAL_DEVICE_DIRECTORY, GET_ALL_DATA_VALUES, GET_DATA_VALUES, SET_DATA_VALUES, - GET_DATA_DIRECTORY, GET_DATA_DEFINITION, GET_DATA_SET_VALUES, SET_DATA_SET_VALUES, CREATE_DATA_SET, - DELETE_DATA_SET, GET_DATA_SET_DIRECTORY, SELECT_ACTIVE_SG, SELECT_EDIT_SG, SET_EDIT_SG_VALUE, - CONFIRM_EDIT_SG_VALUES, GET_EDIT_SG_VALUE, GET_SGCB_VALUES, REPORT, GET_BRCB_VALUES, SET_BRCB_VALUES, - GET_URCB_VALUES, SET_URCB_VALUES, GET_LCB_VALUES, SET_LCB_VALUES, QUERY_LOG_BY_TIME, QUERY_LOG_AFTER, - GET_LOG_STATUS_VALUES, SEND_GOOSE_MESSAGE, GET_GO_CB_VALUES, SET_GO_CB_VALUES, GET_GO_REFERENCE, - GET_GOOSE_ELEMENT_NUMBER, SEND_MSV_MESSAGE, GET_MSVCB_VALUES, SET_MSVCB_VALUES, SEND_USV_MESSAGE, - GET_USVCB_VALUES, SET_USVCB_VALUES, SELECT, SELECT_WITH_VALUE, CANCEL, OPERATE, COMMAND_TERMINATION, - TIME_ACTIVATED_OPERATE, GET_FILE, SET_FILE, DELETE_FILE, GET_FILE_ATTRIBUTE_VALUES, TIME_SYNCHRONIZATION, - INTERNAL_CHANGE, GET_LOGICAL_NODE_DIRECTORY, GET_MSV_REFERENCE, GET_MSV_ELEMENT_NUMBER, GET_USV_REFERENCE, - GET_USV_ELEMENT_NUMBER, }; + private static final ACSIServicesKind[] VALUES_ARRAY = new ACSIServicesKind[] { + ASSOCIATE, + ABORT, + RELEASE, + GET_SERVER_DIRECTORY, + GET_LOGICAL_DEVICE_DIRECTORY, + GET_ALL_DATA_VALUES, + GET_DATA_VALUES, + SET_DATA_VALUES, + GET_DATA_DIRECTORY, + GET_DATA_DEFINITION, + GET_DATA_SET_VALUES, + SET_DATA_SET_VALUES, + CREATE_DATA_SET, + DELETE_DATA_SET, + GET_DATA_SET_DIRECTORY, + SELECT_ACTIVE_SG, + SELECT_EDIT_SG, + SET_EDIT_SG_VALUE, + CONFIRM_EDIT_SG_VALUES, + GET_EDIT_SG_VALUE, + GET_SGCB_VALUES, + REPORT, + GET_BRCB_VALUES, + SET_BRCB_VALUES, + GET_URCB_VALUES, + SET_URCB_VALUES, + GET_LCB_VALUES, + SET_LCB_VALUES, + QUERY_LOG_BY_TIME, + QUERY_LOG_AFTER, + GET_LOG_STATUS_VALUES, + SEND_GOOSE_MESSAGE, + GET_GO_CB_VALUES, + SET_GO_CB_VALUES, + GET_GO_REFERENCE, + GET_GOOSE_ELEMENT_NUMBER, + SEND_MSV_MESSAGE, + GET_MSVCB_VALUES, + SET_MSVCB_VALUES, + SEND_USV_MESSAGE, + GET_USVCB_VALUES, + SET_USVCB_VALUES, + SELECT, + SELECT_WITH_VALUE, + CANCEL, + OPERATE, + COMMAND_TERMINATION, + TIME_ACTIVATED_OPERATE, + GET_FILE, + SET_FILE, + DELETE_FILE, + GET_FILE_ATTRIBUTE_VALUES, + TIME_SYNCHRONIZATION, + INTERNAL_CHANGE, + GET_LOGICAL_NODE_DIRECTORY, + GET_MSV_REFERENCE, + GET_MSV_ELEMENT_NUMBER, + GET_USV_REFERENCE, + GET_USV_ELEMENT_NUMBER, + }; /** * A public read-only list of all the '<em><b>ACSI Services Kind</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java index 69842a3bb46f277521f507747125ba82c4977b1e..fe43bd11ddd9429c092c398355809baf53568ae2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/CBKind.java @@ -141,7 +141,12 @@ public enum CBKind implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final CBKind[] VALUES_ARRAY = new CBKind[] { RCB, LCB, GO_CB, SVCB, }; + private static final CBKind[] VALUES_ARRAY = new CBKind[] { + RCB, + LCB, + GO_CB, + SVCB, + }; /** * A public read-only list of all the '<em><b>CB Kind</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java index fc2e4cfeaf46f0b7b972d60a0ab0eac85b0ad3ec..d5b5e27cc6ac997368a39987dc0685e10ba474d8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/DefinedAttributeTypeKind.java @@ -122,8 +122,11 @@ public enum DefinedAttributeTypeKind implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final DefinedAttributeTypeKind[] VALUES_ARRAY = new DefinedAttributeTypeKind[] { BASIC, ENUMERATED, - CONSTRUCTED, }; + private static final DefinedAttributeTypeKind[] VALUES_ARRAY = new DefinedAttributeTypeKind[] { + BASIC, + ENUMERATED, + CONSTRUCTED, + }; /** * A public read-only list of all the '<em><b>Defined Attribute Type Kind</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java index e9b3232a25158dd772501c9eb1a1e1b79938eecf..c2aeb6e319261b3909b02b0e3da5f627cf584c67 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/LicenseKind.java @@ -116,7 +116,11 @@ public enum LicenseKind implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final LicenseKind[] VALUES_ARRAY = new LicenseKind[] { STANDARD, PRIVATE, NONE, }; + private static final LicenseKind[] VALUES_ARRAY = new LicenseKind[] { + STANDARD, + PRIVATE, + NONE, + }; /** * A public read-only list of all the '<em><b>License Kind</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java index aba2cf3304d5f6fe814b7113520b7304f5cb043e..033afd3878147a3c0939c9043822163eade0d22d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/PubStage.java @@ -284,7 +284,17 @@ public enum PubStage implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final PubStage[] VALUES_ARRAY = new PubStage[] { WD, CD, CDV, DTS, DTR, FDIS, TS, TR, IS, }; + private static final PubStage[] VALUES_ARRAY = new PubStage[] { + WD, + CD, + CDV, + DTS, + DTR, + FDIS, + TS, + TR, + IS, + }; /** * A public read-only list of all the '<em><b>Pub Stage</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java index d1910043fa453e175eadc18f9928ab52125ccc24..99a4f8269d2f54bdd2692275dc83c46152454ad9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/UndefinedAttributeTypeKind.java @@ -68,7 +68,9 @@ public enum UndefinedAttributeTypeKind implements Enumerator { * <!-- end-user-doc --> * @generated */ - private static final UndefinedAttributeTypeKind[] VALUES_ARRAY = new UndefinedAttributeTypeKind[] { UNDEFINED, }; + private static final UndefinedAttributeTypeKind[] VALUES_ARRAY = new UndefinedAttributeTypeKind[] { + UNDEFINED, + }; /** * A public read-only list of all the '<em><b>Undefined Attribute Type Kind</b></em>' enumerators. diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java index 9e96ff4a693b1d786c98cc3593092d39cb5d4811..6043d428410339ac376da2518e85d7226341f088 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationImpl.java @@ -146,8 +146,9 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABBREVIATION__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATION__DESC_ID, oldDescID, descID, + !oldDescIDESet ) ); } /** @@ -161,8 +162,9 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ABBREVIATION__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.ABBREVIATION__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -196,8 +198,9 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABBREVIATION__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATION__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -211,8 +214,9 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ABBREVIATION__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.ABBREVIATION__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -258,14 +262,17 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { if( EcoreUtil.isAncestor( this, newAbbreviations ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newAbbreviations != null ) msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, - NsdPackage.ABBREVIATIONS__ABBREVIATION, Abbreviations.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newAbbreviations != null ) + msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, + NsdPackage.ABBREVIATIONS__ABBREVIATION, Abbreviations.class, msgs ); msgs = basicSetAbbreviations( newAbbreviations, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABBREVIATION__ABBREVIATIONS, newAbbreviations, newAbbreviations ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATION__ABBREVIATIONS, + newAbbreviations, newAbbreviations ) ); } /** @@ -277,7 +284,8 @@ public class AbbreviationImpl extends NsdObjectImpl implements Abbreviation { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.ABBREVIATION__ABBREVIATIONS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetAbbreviations( ( Abbreviations ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java index 51cc87219d098cf13909ae245798dfc3a7d16869..a8370a9d168cdd4dbe18dcec59ee8f03b2dcdfff 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbbreviationsImpl.java @@ -152,7 +152,8 @@ public class AbbreviationsImpl extends NsdObjectImpl implements Abbreviations { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__ABBREVIATIONS, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -195,14 +196,17 @@ public class AbbreviationsImpl extends NsdObjectImpl implements Abbreviations { if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__ABBREVIATIONS, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, NsdPackage.SERVICE_NS__ABBREVIATIONS, + ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABBREVIATIONS__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABBREVIATIONS__SERVICE_NS, newServiceNS, + newServiceNS ) ); } /** @@ -218,10 +222,12 @@ public class AbbreviationsImpl extends NsdObjectImpl implements Abbreviations { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getAbbreviation() ).basicAdd( otherEnd, msgs ); case NsdPackage.ABBREVIATIONS__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); case NsdPackage.ABBREVIATIONS__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java index bab18874c9a21bd1afa3808afaaf35da22aaad42..3e56634d002473746fe8bb2dc4571c5ec1185f22 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AbstractLNClassImpl.java @@ -132,8 +132,9 @@ public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNCla name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABSTRACT_LN_CLASS__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABSTRACT_LN_CLASS__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -147,8 +148,9 @@ public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNCla boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ABSTRACT_LN_CLASS__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.ABSTRACT_LN_CLASS__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -194,14 +196,17 @@ public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNCla if( EcoreUtil.isAncestor( this, newLNClasses ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newLNClasses != null ) msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, - NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS, LNClasses.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newLNClasses != null ) + msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, NsdPackage.LN_CLASSES__ABSTRACT_LN_CLASS, + LNClasses.class, msgs ); msgs = basicSetLNClasses( newLNClasses, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ABSTRACT_LN_CLASS__LN_CLASSES, newLNClasses, newLNClasses ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ABSTRACT_LN_CLASS__LN_CLASSES, + newLNClasses, newLNClasses ) ); } /** @@ -249,7 +254,8 @@ public class AbstractLNClassImpl extends AnyLNClassImpl implements AbstractLNCla public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.ABSTRACT_LN_CLASS__LN_CLASSES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetLNClasses( ( LNClasses ) otherEnd, msgs ); case NsdPackage.ABSTRACT_LN_CLASS__REFERRED_BY_ANY_LN_CLASS: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAnyLNClass() ) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgArrayImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgArrayImpl.java index baa573fc1b3c557716fa645ec91ad96f16ecd31e..0d0fa74aca41815bd7d7d9a5438c08ee9c780777 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgArrayImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgArrayImpl.java @@ -202,8 +202,9 @@ public abstract class AgArrayImpl extends MinimalEObjectImpl.Container implement isArray = newIsArray; boolean oldIsArrayESet = isArrayESet; isArrayESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ARRAY__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ARRAY__IS_ARRAY, oldIsArray, isArray, + !oldIsArrayESet ) ); } /** @@ -217,8 +218,9 @@ public abstract class AgArrayImpl extends MinimalEObjectImpl.Container implement boolean oldIsArrayESet = isArrayESet; isArray = IS_ARRAY_EDEFAULT; isArrayESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_ARRAY__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ARRAY__IS_ARRAY, oldIsArray, + IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); } /** @@ -304,8 +306,9 @@ public abstract class AgArrayImpl extends MinimalEObjectImpl.Container implement minIndex = newMinIndex; boolean oldMinIndexESet = minIndexESet; minIndexESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ARRAY__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ARRAY__MIN_INDEX, oldMinIndex, + minIndex, !oldMinIndexESet ) ); } /** @@ -319,8 +322,9 @@ public abstract class AgArrayImpl extends MinimalEObjectImpl.Container implement boolean oldMinIndexESet = minIndexESet; minIndex = MIN_INDEX_EDEFAULT; minIndexESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_ARRAY__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ARRAY__MIN_INDEX, oldMinIndex, + MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); } /** @@ -354,8 +358,9 @@ public abstract class AgArrayImpl extends MinimalEObjectImpl.Container implement sizeAttribute = newSizeAttribute; boolean oldSizeAttributeESet = sizeAttributeESet; sizeAttributeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ARRAY__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ARRAY__SIZE_ATTRIBUTE, + oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeAndValuesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeAndValuesImpl.java index d1310ac5dffa8da707735115354e5747d148c5ab..69f230e35f300599a81ee8195d863e55065cb5ed 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeAndValuesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeAndValuesImpl.java @@ -173,9 +173,10 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i defaultValue = newDefaultValue; boolean oldDefaultValueESet = defaultValueESet; defaultValueESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, - oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, oldDefaultValue, defaultValue, + !oldDefaultValueESet ) ); } /** @@ -189,9 +190,10 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i boolean oldDefaultValueESet = defaultValueESet; defaultValue = DEFAULT_VALUE_EDEFAULT; defaultValueESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, - oldDefaultValue, DEFAULT_VALUE_EDEFAULT, oldDefaultValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__DEFAULT_VALUE, oldDefaultValue, DEFAULT_VALUE_EDEFAULT, + oldDefaultValueESet ) ); } /** @@ -225,8 +227,9 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i maxValue = newMaxValue; boolean oldMaxValueESet = maxValueESet; maxValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, oldMaxValue, maxValue, !oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, + oldMaxValue, maxValue, !oldMaxValueESet ) ); } /** @@ -240,9 +243,10 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i boolean oldMaxValueESet = maxValueESet; maxValue = MAX_VALUE_EDEFAULT; maxValueESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, - oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MAX_VALUE, oldMaxValue, MAX_VALUE_EDEFAULT, + oldMaxValueESet ) ); } /** @@ -276,8 +280,9 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i minValue = newMinValue; boolean oldMinValueESet = minValueESet; minValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, oldMinValue, minValue, !oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, + oldMinValue, minValue, !oldMinValueESet ) ); } /** @@ -291,9 +296,10 @@ public abstract class AgAttributeTypeAndValuesImpl extends AgAttributeTypeImpl i boolean oldMinValueESet = minValueESet; minValue = MIN_VALUE_EDEFAULT; minValueESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, - oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_ATTRIBUTE_TYPE_AND_VALUES__MIN_VALUE, oldMinValue, MIN_VALUE_EDEFAULT, + oldMinValueESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeImpl.java index ddf1d7d18691274c3e7748ef0632cc05c48b85b6..c8f1866bd749312a703929643e4f901b7b6030ec 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgAttributeTypeImpl.java @@ -146,8 +146,9 @@ public abstract class AgAttributeTypeImpl extends MinimalEObjectImpl.Container i type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ATTRIBUTE_TYPE__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ATTRIBUTE_TYPE__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -161,8 +162,9 @@ public abstract class AgAttributeTypeImpl extends MinimalEObjectImpl.Container i boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_ATTRIBUTE_TYPE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ATTRIBUTE_TYPE__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -196,8 +198,9 @@ public abstract class AgAttributeTypeImpl extends MinimalEObjectImpl.Container i typeKind = newTypeKind; boolean oldTypeKindESet = typeKindESet; typeKindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_ATTRIBUTE_TYPE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_ATTRIBUTE_TYPE__TYPE_KIND, + oldTypeKind, typeKind, !oldTypeKindESet ) ); } /** @@ -211,8 +214,9 @@ public abstract class AgAttributeTypeImpl extends MinimalEObjectImpl.Container i boolean oldTypeKindESet = typeKindESet; typeKind = TYPE_KIND_EDEFAULT; typeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_ATTRIBUTE_TYPE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_ATTRIBUTE_TYPE__TYPE_KIND, + oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSIdentificationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSIdentificationImpl.java index b17f75889cbeb8802699d02bcc52906d48b96ca5..eb17ed2a18df2ea8d83abf6fb45604dd4826440e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSIdentificationImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSIdentificationImpl.java @@ -233,8 +233,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_NS_IDENTIFICATION__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_NS_IDENTIFICATION__RELEASE, + oldRelease, release, !oldReleaseESet ) ); } /** @@ -248,8 +249,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_NS_IDENTIFICATION__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NS_IDENTIFICATION__RELEASE, + oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -283,8 +285,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_NS_IDENTIFICATION__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_NS_IDENTIFICATION__VERSION, + oldVersion, version, !oldVersionESet ) ); } /** @@ -298,8 +301,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_NS_IDENTIFICATION__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NS_IDENTIFICATION__VERSION, + oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); } /** @@ -333,8 +337,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe id = newId; boolean oldIdESet = idESet; idESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_NS_IDENTIFICATION__ID, oldId, id, !oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_NS_IDENTIFICATION__ID, oldId, id, + !oldIdESet ) ); } /** @@ -348,8 +353,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_NS_IDENTIFICATION__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NS_IDENTIFICATION__ID, oldId, + ID_EDEFAULT, oldIdESet ) ); } /** @@ -383,8 +389,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_NS_IDENTIFICATION__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_NS_IDENTIFICATION__REVISION, + oldRevision, revision, !oldRevisionESet ) ); } /** @@ -398,8 +405,9 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_NS_IDENTIFICATION__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NS_IDENTIFICATION__REVISION, + oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -449,9 +457,10 @@ public abstract class AgNSIdentificationImpl extends MinimalEObjectImpl.Containe boolean oldPublicationStageESet = publicationStageESet; publicationStage = PUBLICATION_STAGE_EDEFAULT; publicationStageESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, - oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, oldPublicationStageESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_NS_IDENTIFICATION__PUBLICATION_STAGE, oldPublicationStage, PUBLICATION_STAGE_EDEFAULT, + oldPublicationStageESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSdescImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSdescImpl.java index 66602cb59dc7d9f89ff0504d9bc4913087419d59..4be12683c63d1cbe66d79269318defc42e795280 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSdescImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgNSdescImpl.java @@ -112,8 +112,9 @@ public abstract class AgNSdescImpl extends MinimalEObjectImpl.Container implemen descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_NSDESC__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_NSDESC__DESC_ID, oldDescID, descID, + !oldDescIDESet ) ); } /** @@ -127,8 +128,9 @@ public abstract class AgNSdescImpl extends MinimalEObjectImpl.Container implemen boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_NSDESC__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_NSDESC__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionDerivedStatisticsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionDerivedStatisticsImpl.java index dfffe355a396acb994ba2966cd2a2653bd999e39..310c9dbc005c1ad1ec08a49292e43d21e256acc9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionDerivedStatisticsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionDerivedStatisticsImpl.java @@ -173,9 +173,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO dsPresCond = newDsPresCond; boolean oldDsPresCondESet = dsPresCondESet; dsPresCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, oldDsPresCond, dsPresCond, - !oldDsPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, oldDsPresCond, dsPresCond, + !oldDsPresCondESet ) ); } /** @@ -189,9 +190,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO boolean oldDsPresCondESet = dsPresCondESet; dsPresCond = DS_PRES_COND_EDEFAULT; dsPresCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, oldDsPresCond, DS_PRES_COND_EDEFAULT, - oldDsPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND, oldDsPresCond, + DS_PRES_COND_EDEFAULT, oldDsPresCondESet ) ); } /** @@ -225,9 +227,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO dsPresCondArgs = newDsPresCondArgs; boolean oldDsPresCondArgsESet = dsPresCondArgsESet; dsPresCondArgsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, oldDsPresCondArgs, - dsPresCondArgs, !oldDsPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, oldDsPresCondArgs, + dsPresCondArgs, !oldDsPresCondArgsESet ) ); } /** @@ -241,9 +244,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO boolean oldDsPresCondArgsESet = dsPresCondArgsESet; dsPresCondArgs = DS_PRES_COND_ARGS_EDEFAULT; dsPresCondArgsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, oldDsPresCondArgs, - DS_PRES_COND_ARGS_EDEFAULT, oldDsPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS, oldDsPresCondArgs, + DS_PRES_COND_ARGS_EDEFAULT, oldDsPresCondArgsESet ) ); } /** @@ -277,9 +281,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO dsPresCondArgsID = newDsPresCondArgsID; boolean oldDsPresCondArgsIDESet = dsPresCondArgsIDESet; dsPresCondArgsIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, - dsPresCondArgsID, !oldDsPresCondArgsIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, + dsPresCondArgsID, !oldDsPresCondArgsIDESet ) ); } /** @@ -293,9 +298,10 @@ public abstract class AgPresenceConditionDerivedStatisticsImpl extends MinimalEO boolean oldDsPresCondArgsIDESet = dsPresCondArgsIDESet; dsPresCondArgsID = DS_PRES_COND_ARGS_ID_EDEFAULT; dsPresCondArgsIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, - DS_PRES_COND_ARGS_ID_EDEFAULT, oldDsPresCondArgsIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_PRESENCE_CONDITION_DERIVED_STATISTICS__DS_PRES_COND_ARGS_ID, oldDsPresCondArgsID, + DS_PRES_COND_ARGS_ID_EDEFAULT, oldDsPresCondArgsIDESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionImpl.java index c53aac7befc93c2e7bf91275ed41b363eab12e3f..09d6747f5e670e473b63558381b49597af4b4009 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgPresenceConditionImpl.java @@ -172,8 +172,9 @@ public abstract class AgPresenceConditionImpl extends MinimalEObjectImpl.Contain presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_PRESENCE_CONDITION__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_PRESENCE_CONDITION__PRES_COND, + oldPresCond, presCond, !oldPresCondESet ) ); } /** @@ -187,8 +188,9 @@ public abstract class AgPresenceConditionImpl extends MinimalEObjectImpl.Contain boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_PRESENCE_CONDITION__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_PRESENCE_CONDITION__PRES_COND, + oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -290,9 +292,10 @@ public abstract class AgPresenceConditionImpl extends MinimalEObjectImpl.Contain boolean oldPresCondArgsIDESet = presCondArgsIDESet; presCondArgsID = PRES_COND_ARGS_ID_EDEFAULT; presCondArgsIDESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, - oldPresCondArgsID, PRES_COND_ARGS_ID_EDEFAULT, oldPresCondArgsIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_PRESENCE_CONDITION__PRES_COND_ARGS_ID, oldPresCondArgsID, PRES_COND_ARGS_ID_EDEFAULT, + oldPresCondArgsIDESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgTrgOpImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgTrgOpImpl.java index 86ccc93844cda252f016642e36ec15eab646518e..29ae5f627fd2c32100e3f45b212250efccddf373 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgTrgOpImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgTrgOpImpl.java @@ -172,8 +172,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement dchg = newDchg; boolean oldDchgESet = dchgESet; dchgESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_TRG_OP__DCHG, oldDchg, dchg, !oldDchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_TRG_OP__DCHG, oldDchg, dchg, + !oldDchgESet ) ); } /** @@ -187,8 +188,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement boolean oldDchgESet = dchgESet; dchg = DCHG_EDEFAULT; dchgESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_TRG_OP__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_TRG_OP__DCHG, oldDchg, + DCHG_EDEFAULT, oldDchgESet ) ); } /** @@ -222,8 +224,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement dupd = newDupd; boolean oldDupdESet = dupdESet; dupdESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_TRG_OP__DUPD, oldDupd, dupd, !oldDupdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_TRG_OP__DUPD, oldDupd, dupd, + !oldDupdESet ) ); } /** @@ -237,8 +240,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement boolean oldDupdESet = dupdESet; dupd = DUPD_EDEFAULT; dupdESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_TRG_OP__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_TRG_OP__DUPD, oldDupd, + DUPD_EDEFAULT, oldDupdESet ) ); } /** @@ -272,8 +276,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement qchg = newQchg; boolean oldQchgESet = qchgESet; qchgESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_TRG_OP__QCHG, oldQchg, qchg, !oldQchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_TRG_OP__QCHG, oldQchg, qchg, + !oldQchgESet ) ); } /** @@ -287,8 +292,9 @@ public abstract class AgTrgOpImpl extends MinimalEObjectImpl.Container implement boolean oldQchgESet = qchgESet; qchg = QCHG_EDEFAULT; qchgESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_TRG_OP__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_TRG_OP__QCHG, oldQchg, + QCHG_EDEFAULT, oldQchgESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUMLImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUMLImpl.java index 939d85c2bfc93835fa7ccd19b23ff0aa9d9f9186..f4dbd574985460716af0b68f0432e4e0cfc91aac 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUMLImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUMLImpl.java @@ -144,8 +144,9 @@ public abstract class AgUMLImpl extends MinimalEObjectImpl.Container implements umlDate = newUmlDate; boolean oldUmlDateESet = umlDateESet; umlDateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_UML__UML_DATE, oldUmlDate, umlDate, !oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_UML__UML_DATE, oldUmlDate, umlDate, + !oldUmlDateESet ) ); } /** @@ -159,8 +160,9 @@ public abstract class AgUMLImpl extends MinimalEObjectImpl.Container implements boolean oldUmlDateESet = umlDateESet; umlDate = UML_DATE_EDEFAULT; umlDateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_UML__UML_DATE, oldUmlDate, UML_DATE_EDEFAULT, oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_UML__UML_DATE, oldUmlDate, + UML_DATE_EDEFAULT, oldUmlDateESet ) ); } /** @@ -194,8 +196,9 @@ public abstract class AgUMLImpl extends MinimalEObjectImpl.Container implements umlVersion = newUmlVersion; boolean oldUmlVersionESet = umlVersionESet; umlVersionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.AG_UML__UML_VERSION, oldUmlVersion, umlVersion, !oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.AG_UML__UML_VERSION, oldUmlVersion, + umlVersion, !oldUmlVersionESet ) ); } /** @@ -209,8 +212,9 @@ public abstract class AgUMLImpl extends MinimalEObjectImpl.Container implements boolean oldUmlVersionESet = umlVersionESet; umlVersion = UML_VERSION_EDEFAULT; umlVersionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.AG_UML__UML_VERSION, oldUmlVersion, UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_UML__UML_VERSION, oldUmlVersion, + UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUnderlyingTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUnderlyingTypeImpl.java index 35f50d01e70827c1c50db40049bb737bd89dc6bc..b81e75c1d72c7e07d8d4df8a40ca2363d4bb728a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUnderlyingTypeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AgUnderlyingTypeImpl.java @@ -211,9 +211,10 @@ public abstract class AgUnderlyingTypeImpl extends MinimalEObjectImpl.Container boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet; underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT; underlyingTypeKindESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, - oldUnderlyingTypeKind, UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind, + UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java index acb7be80edc637ed7a3a2fff142f496eea4bf484..07e1e5cfc8a3101d3b3477da96dc34ef95986bab 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java @@ -28,7 +28,6 @@ import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; import java.lang.reflect.InvocationTargetException; import java.util.Collection; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -189,8 +188,9 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla base = newBase; boolean oldBaseESet = baseESet; baseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ANY_LN_CLASS__BASE, oldBase, base, !oldBaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ANY_LN_CLASS__BASE, oldBase, base, + !oldBaseESet ) ); } /** @@ -204,8 +204,9 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla boolean oldBaseESet = baseESet; base = BASE_EDEFAULT; baseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ANY_LN_CLASS__BASE, oldBase, BASE_EDEFAULT, oldBaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.ANY_LN_CLASS__BASE, oldBase, + BASE_EDEFAULT, oldBaseESet ) ); } /** @@ -272,9 +273,10 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla else { boolean oldRefersToAbstractLNClassESet = refersToAbstractLNClassESet; refersToAbstractLNClassESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, - newRefersToAbstractLNClass, newRefersToAbstractLNClass, !oldRefersToAbstractLNClassESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, newRefersToAbstractLNClass, + newRefersToAbstractLNClass, !oldRefersToAbstractLNClassESet ) ); } } @@ -317,9 +319,10 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla else { boolean oldRefersToAbstractLNClassESet = refersToAbstractLNClassESet; refersToAbstractLNClassESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, null, null, - oldRefersToAbstractLNClassESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.ANY_LN_CLASS__REFERS_TO_ABSTRACT_LN_CLASS, null, null, + oldRefersToAbstractLNClassESet ) ); } } @@ -513,23 +516,29 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla @Override public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; - if( !isSetBase() ) return false; - - // This code assumes that the referred AbstractLNClass is in the same NS - // TODO: check that it is right - LNClasses lNClasses = ( LNClasses ) eContainer(); - EList< AbstractLNClass > l = lNClasses.getAbstractLNClass(); - setRefersToAbstractLNClass( l.stream() - .filter( abstractLNClass -> abstractLNClass.getName().equals( getBase() ) ).findAny().orElse( null ) ); - if( getRefersToAbstractLNClass() == null ) { - console.error( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() - + ") in NS (id:" + lNClasses.getNS().getId() + ") is unknown" ); - } - else { - console.verbose( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() - + ") in NS (id:" + lNClasses.getNS().getId() + ") found in NS (id:" - + getRefersToAbstractLNClass().getLNClasses().getNS().getId() + ")" ); + + if( isSetBase() ) { + + // This code assumes that the referred AbstractLNClass is in the same NS + // TODO: check that it is right + getLNClasses() + .getAbstractLNClass() + .stream() + .filter( abstractLNClass -> abstractLNClass.getName().equals( getBase() ) ) + .findAny() + .ifPresent( abstractLNClass -> setRefersToAbstractLNClass( abstractLNClass ) ); + + if( isSetRefersToAbstractLNClass() ) { + console.verbose( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() + + ") in NS (id:" + getLNClasses().getNS().getId() + ") found in NS (id:" + + getRefersToAbstractLNClass().getLNClasses().getNS().getId() + ")" ); + } + else { + console.error( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() + + ") in NS (id:" + getLNClasses().getNS().getId() + ") is unknown" ); + } } + return false; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java index 2d2731ddfbd0fa7ec0baad5a039eac47190da893..0a135f2877be9e981af063359a61f16a71d3184a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServiceNSImpl.java @@ -198,8 +198,9 @@ public class ApplicableServiceNSImpl extends CopyrightedImpl implements Applicab date = newDate; boolean oldDateESet = dateESet; dateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLICABLE_SERVICE_NS__DATE, oldDate, date, !oldDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLICABLE_SERVICE_NS__DATE, oldDate, + date, !oldDateESet ) ); } /** @@ -213,8 +214,9 @@ public class ApplicableServiceNSImpl extends CopyrightedImpl implements Applicab boolean oldDateESet = dateESet; date = DATE_EDEFAULT; dateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLICABLE_SERVICE_NS__DATE, oldDate, DATE_EDEFAULT, oldDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLICABLE_SERVICE_NS__DATE, oldDate, + DATE_EDEFAULT, oldDateESet ) ); } /** @@ -248,8 +250,9 @@ public class ApplicableServiceNSImpl extends CopyrightedImpl implements Applicab version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLICABLE_SERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLICABLE_SERVICE_NS__VERSION, + oldVersion, version, !oldVersionESet ) ); } /** @@ -263,8 +266,9 @@ public class ApplicableServiceNSImpl extends CopyrightedImpl implements Applicab boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLICABLE_SERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLICABLE_SERVICE_NS__VERSION, + oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java index 2a076381c3880118b1bb21966aff8982e19c1a9e..bb9725cf2bde349395519c23eeb4cf136c4d5c63 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ApplicableServicesImpl.java @@ -200,16 +200,18 @@ public class ApplicableServicesImpl extends NsdObjectImpl implements ApplicableS if( EcoreUtil.isAncestor( this, newFunctionalConstraint ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newFunctionalConstraint != null ) msgs = ( ( InternalEObject ) newFunctionalConstraint ).eInverseAdd( this, NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, FunctionalConstraint.class, msgs ); msgs = basicSetFunctionalConstraint( newFunctionalConstraint, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, - newFunctionalConstraint, newFunctionalConstraint ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, newFunctionalConstraint, + newFunctionalConstraint ) ); } /** @@ -228,7 +230,8 @@ public class ApplicableServicesImpl extends NsdObjectImpl implements ApplicableS return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDataSetMemberOf() ) .basicAdd( otherEnd, msgs ); case NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetFunctionalConstraint( ( FunctionalConstraint ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java index cd28eb2fd305aca2281094ad434858415bb7675a..2b09baab81298a79e2ceb453f3eaf1f53e43d18a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AppliesToTypeImpl.java @@ -237,8 +237,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, + release, !oldReleaseESet ) ); } /** @@ -252,8 +253,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLIES_TO_TYPE__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -287,8 +289,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, + version, !oldVersionESet ) ); } /** @@ -302,8 +305,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLIES_TO_TYPE__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** @@ -337,8 +341,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { id = newId; boolean oldIdESet = idESet; idESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLIES_TO_TYPE__ID, oldId, id, !oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLIES_TO_TYPE__ID, oldId, id, + !oldIdESet ) ); } /** @@ -352,8 +357,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLIES_TO_TYPE__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLIES_TO_TYPE__ID, oldId, + ID_EDEFAULT, oldIdESet ) ); } /** @@ -387,8 +393,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLIES_TO_TYPE__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLIES_TO_TYPE__REVISION, oldRevision, + revision, !oldRevisionESet ) ); } /** @@ -402,8 +409,9 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.APPLIES_TO_TYPE__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.APPLIES_TO_TYPE__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -503,14 +511,17 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { if( EcoreUtil.isAncestor( this, newServiceNsUsage ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNsUsage != null ) msgs = ( ( InternalEObject ) newServiceNsUsage ).eInverseAdd( this, - NsdPackage.SERVICE_NS_USAGE__APPLIES_TO, ServiceNsUsage.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNsUsage != null ) + msgs = ( ( InternalEObject ) newServiceNsUsage ).eInverseAdd( this, + NsdPackage.SERVICE_NS_USAGE__APPLIES_TO, ServiceNsUsage.class, msgs ); msgs = basicSetServiceNsUsage( newServiceNsUsage, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.APPLIES_TO_TYPE__SERVICE_NS_USAGE, newServiceNsUsage, newServiceNsUsage ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.APPLIES_TO_TYPE__SERVICE_NS_USAGE, + newServiceNsUsage, newServiceNsUsage ) ); } /** @@ -522,7 +533,8 @@ public class AppliesToTypeImpl extends NsdObjectImpl implements AppliesToType { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.APPLIES_TO_TYPE__SERVICE_NS_USAGE: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNsUsage( ( ServiceNsUsage ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java index f282cdd5ca178b43e195e22bd4daf5c12577599f..8afd0617104ef1593c88092ac369181f7646d681 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypeImpl.java @@ -162,8 +162,9 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.BASIC_TYPE__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.BASIC_TYPE__DESC_ID, oldDescID, descID, + !oldDescIDESet ) ); } /** @@ -177,8 +178,9 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.BASIC_TYPE__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.BASIC_TYPE__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -212,8 +214,9 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.BASIC_TYPE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.BASIC_TYPE__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -227,8 +230,9 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.BASIC_TYPE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.BASIC_TYPE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -274,14 +278,17 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { if( EcoreUtil.isAncestor( this, newBasicTypes ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newBasicTypes != null ) msgs = ( ( InternalEObject ) newBasicTypes ).eInverseAdd( this, - NsdPackage.BASIC_TYPES__BASIC_TYPE, BasicTypes.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newBasicTypes != null ) + msgs = ( ( InternalEObject ) newBasicTypes ).eInverseAdd( this, NsdPackage.BASIC_TYPES__BASIC_TYPE, + BasicTypes.class, msgs ); msgs = basicSetBasicTypes( newBasicTypes, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.BASIC_TYPE__BASIC_TYPES, newBasicTypes, newBasicTypes ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.BASIC_TYPE__BASIC_TYPES, newBasicTypes, + newBasicTypes ) ); } /** @@ -329,7 +336,8 @@ public class BasicTypeImpl extends NsdObjectImpl implements BasicType { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.BASIC_TYPE__BASIC_TYPES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetBasicTypes( ( BasicTypes ) otherEnd, msgs ); case NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDataAttribute() ) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java index 67968360612e6f8f36fe3520c761e59630e5c0ba..8b3961c6d2ab712146cf79271cbf45867ca5d904 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/BasicTypesImpl.java @@ -150,7 +150,8 @@ public class BasicTypesImpl extends NsdObjectImpl implements BasicTypes { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__BASIC_TYPES, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -173,7 +174,8 @@ public class BasicTypesImpl extends NsdObjectImpl implements BasicTypes { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getBasicType() ).basicAdd( otherEnd, msgs ); case NsdPackage.BASIC_TYPES__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java index c18bf256d24f8630262eb6023cbe34f0a70718c4..2c5741cbf9f1d25973dc20a5c2f1c7e71c29b88c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCImpl.java @@ -399,10 +399,12 @@ public class CDCImpl extends TitledClassImpl implements CDC { public void setServiceParameter( ServiceParameter newServiceParameter ) { if( newServiceParameter != serviceParameter ) { NotificationChain msgs = null; - if( serviceParameter != null ) msgs = ( ( InternalEObject ) serviceParameter ).eInverseRemove( this, - NsdPackage.SERVICE_PARAMETER__CDC, ServiceParameter.class, msgs ); - if( newServiceParameter != null ) msgs = ( ( InternalEObject ) newServiceParameter ).eInverseAdd( this, - NsdPackage.SERVICE_PARAMETER__CDC, ServiceParameter.class, msgs ); + if( serviceParameter != null ) + msgs = ( ( InternalEObject ) serviceParameter ).eInverseRemove( this, NsdPackage.SERVICE_PARAMETER__CDC, + ServiceParameter.class, msgs ); + if( newServiceParameter != null ) + msgs = ( ( InternalEObject ) newServiceParameter ).eInverseAdd( this, NsdPackage.SERVICE_PARAMETER__CDC, + ServiceParameter.class, msgs ); msgs = basicSetServiceParameter( newServiceParameter, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -453,8 +455,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { else { boolean oldServiceParameterESet = serviceParameterESet; serviceParameterESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CDC__SERVICE_PARAMETER, null, null, oldServiceParameterESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__SERVICE_PARAMETER, null, null, + oldServiceParameterESet ) ); } } @@ -541,8 +544,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -556,8 +560,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__NAME, - oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__NAME, oldName, NAME_EDEFAULT, + oldNameESet ) ); } /** @@ -591,8 +596,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { statistics = newStatistics; boolean oldStatisticsESet = statisticsESet; statisticsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CDC__STATISTICS, oldStatistics, statistics, !oldStatisticsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__STATISTICS, oldStatistics, + statistics, !oldStatisticsESet ) ); } /** @@ -606,8 +612,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { boolean oldStatisticsESet = statisticsESet; statistics = STATISTICS_EDEFAULT; statisticsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CDC__STATISTICS, oldStatistics, STATISTICS_EDEFAULT, oldStatisticsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__STATISTICS, oldStatistics, + STATISTICS_EDEFAULT, oldStatisticsESet ) ); } /** @@ -693,8 +700,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { variant = newVariant; boolean oldVariantESet = variantESet; variantESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__VARIANT, - oldVariant, variant, !oldVariantESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CDC__VARIANT, oldVariant, variant, + !oldVariantESet ) ); } /** @@ -708,8 +716,9 @@ public class CDCImpl extends TitledClassImpl implements CDC { boolean oldVariantESet = variantESet; variant = VARIANT_EDEFAULT; variantESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__VARIANT, - oldVariant, VARIANT_EDEFAULT, oldVariantESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CDC__VARIANT, oldVariant, + VARIANT_EDEFAULT, oldVariantESet ) ); } /** @@ -754,7 +763,8 @@ public class CDCImpl extends TitledClassImpl implements CDC { if( EcoreUtil.isAncestor( this, newCDCs ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newCDCs != null ) msgs = ( ( InternalEObject ) newCDCs ).eInverseAdd( this, NsdPackage.CD_CS__CDC, CDCs.class, msgs ); msgs = basicSetCDCs( newCDCs, msgs ); @@ -848,11 +858,13 @@ public class CDCImpl extends TitledClassImpl implements CDC { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDataAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.CDC__SERVICE_PARAMETER: - if( serviceParameter != null ) msgs = ( ( InternalEObject ) serviceParameter ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.CDC__SERVICE_PARAMETER, null, msgs ); + if( serviceParameter != null ) + msgs = ( ( InternalEObject ) serviceParameter ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.CDC__SERVICE_PARAMETER, null, msgs ); return basicSetServiceParameter( ( ServiceParameter ) otherEnd, msgs ); case NsdPackage.CDC__CD_CS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCDCs( ( CDCs ) otherEnd, msgs ); case NsdPackage.CDC__REFERRED_BY_DATA_OBJECT: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDataObject() ) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java index c72b7dcd63d5b3453c88bd8c6bb4d140ca991c4c..3925b1f942ebee76720524a98930951b014ed0ea 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CDCsImpl.java @@ -149,7 +149,8 @@ public class CDCsImpl extends NsdObjectImpl implements CDCs { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__CD_CS, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -171,7 +172,8 @@ public class CDCsImpl extends NsdObjectImpl implements CDCs { case NsdPackage.CD_CS__CDC: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getCDC() ).basicAdd( otherEnd, msgs ); case NsdPackage.CD_CS__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java index 442a3bd008897c1780522caf3e6194c64ee2a5af..381bc76b167d76fc7060718bb072e1420650490f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ChangesImpl.java @@ -270,8 +270,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { changesID = newChangesID; boolean oldChangesIDESet = changesIDESet; changesIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__CHANGES_ID, oldChangesID, changesID, !oldChangesIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__CHANGES_ID, oldChangesID, + changesID, !oldChangesIDESet ) ); } /** @@ -285,8 +286,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldChangesIDESet = changesIDESet; changesID = CHANGES_ID_EDEFAULT; changesIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__CHANGES_ID, oldChangesID, CHANGES_ID_EDEFAULT, oldChangesIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__CHANGES_ID, oldChangesID, + CHANGES_ID_EDEFAULT, oldChangesIDESet ) ); } /** @@ -320,8 +322,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { date = newDate; boolean oldDateESet = dateESet; dateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__DATE, - oldDate, date, !oldDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__DATE, oldDate, date, + !oldDateESet ) ); } /** @@ -335,8 +338,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldDateESet = dateESet; date = DATE_EDEFAULT; dateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__DATE, oldDate, DATE_EDEFAULT, oldDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__DATE, oldDate, DATE_EDEFAULT, + oldDateESet ) ); } /** @@ -370,8 +374,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__REVISION, oldRevision, revision, + !oldRevisionESet ) ); } /** @@ -385,8 +390,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -420,8 +426,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { tissues = newTissues; boolean oldTissuesESet = tissuesESet; tissuesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__TISSUES, oldTissues, tissues, !oldTissuesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__TISSUES, oldTissues, tissues, + !oldTissuesESet ) ); } /** @@ -435,8 +442,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldTissuesESet = tissuesESet; tissues = TISSUES_EDEFAULT; tissuesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__TISSUES, oldTissues, TISSUES_EDEFAULT, oldTissuesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__TISSUES, oldTissues, + TISSUES_EDEFAULT, oldTissuesESet ) ); } /** @@ -481,7 +489,8 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__CHANGES, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -524,14 +533,17 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__CHANGES, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, NsdPackage.SERVICE_NS__CHANGES, + ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__SERVICE_NS, newServiceNS, + newServiceNS ) ); } /** @@ -555,8 +567,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__RELEASE, oldRelease, release, + !oldReleaseESet ) ); } /** @@ -570,8 +583,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -605,8 +619,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CHANGES__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CHANGES__VERSION, oldVersion, version, + !oldVersionESet ) ); } /** @@ -620,8 +635,9 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CHANGES__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CHANGES__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** @@ -643,10 +659,12 @@ public class ChangesImpl extends NsdObjectImpl implements Changes { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.CHANGES__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); case NsdPackage.CHANGES__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java index a66195406e585e0916121430498607eb6e725eda..7cd1e568d1ff421b310815e9109611f49a28563b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributeImpl.java @@ -171,8 +171,9 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME, oldName, + name, !oldNameESet ) ); } /** @@ -186,8 +187,9 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.CONSTRUCTED_ATTRIBUTE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -236,16 +238,18 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru if( EcoreUtil.isAncestor( this, newConstructedAttributes ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newConstructedAttributes != null ) msgs = ( ( InternalEObject ) newConstructedAttributes ).eInverseAdd( this, NsdPackage.CONSTRUCTED_ATTRIBUTES__CONSTRUCTED_ATTRIBUTE, ConstructedAttributes.class, msgs ); msgs = basicSetConstructedAttributes( newConstructedAttributes, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.CONSTRUCTED_ATTRIBUTE__CONSTRUCTED_ATTRIBUTES, - newConstructedAttributes, newConstructedAttributes ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.CONSTRUCTED_ATTRIBUTE__CONSTRUCTED_ATTRIBUTES, newConstructedAttributes, + newConstructedAttributes ) ); } /** @@ -284,7 +288,8 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru if( EcoreUtil.isAncestor( this, newServiceTypeRealizations ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newServiceTypeRealizations != null ) msgs = ( ( InternalEObject ) newServiceTypeRealizations ).eInverseAdd( this, NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_TYPE_REALIZATION, ServiceTypeRealizations.class, @@ -292,9 +297,10 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru msgs = basicSetServiceTypeRealizations( newServiceTypeRealizations, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.CONSTRUCTED_ATTRIBUTE__SERVICE_TYPE_REALIZATIONS, newServiceTypeRealizations, - newServiceTypeRealizations ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.CONSTRUCTED_ATTRIBUTE__SERVICE_TYPE_REALIZATIONS, newServiceTypeRealizations, + newServiceTypeRealizations ) ); } /** @@ -310,10 +316,12 @@ public class ConstructedAttributeImpl extends TitledClassImpl implements Constru return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubDataAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.CONSTRUCTED_ATTRIBUTE__CONSTRUCTED_ATTRIBUTES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetConstructedAttributes( ( ConstructedAttributes ) otherEnd, msgs ); case NsdPackage.CONSTRUCTED_ATTRIBUTE__SERVICE_TYPE_REALIZATIONS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceTypeRealizations( ( ServiceTypeRealizations ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java index 584f09c778c036aba895fb6e5e96e94437d9ac17..a73ae2888e952203c1e00eda305896c7ef2f80cd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ConstructedAttributesImpl.java @@ -151,14 +151,17 @@ public class ConstructedAttributesImpl extends NsdObjectImpl implements Construc if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, NS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newNS != null ) + msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, NS.class, + msgs ); msgs = basicSetNS( newNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, newNS, newNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, newNS, + newNS ) ); } /** @@ -174,7 +177,8 @@ public class ConstructedAttributesImpl extends NsdObjectImpl implements Construc return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConstructedAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.CONSTRUCTED_ATTRIBUTES__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java index e72cd1dc44d9a77fd2bd0afe5e56052a829ac26e..fd859aa222debb80cf657e645b3246dff640330d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightNoticeImpl.java @@ -147,18 +147,21 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic public void setNotice( Notice newNotice ) { if( newNotice != notice ) { NotificationChain msgs = null; - if( notice != null ) msgs = ( ( InternalEObject ) notice ).eInverseRemove( this, - NsdPackage.NOTICE__COPYRIGHT_NOTICE, Notice.class, msgs ); - if( newNotice != null ) msgs = ( ( InternalEObject ) newNotice ).eInverseAdd( this, - NsdPackage.NOTICE__COPYRIGHT_NOTICE, Notice.class, msgs ); + if( notice != null ) + msgs = ( ( InternalEObject ) notice ).eInverseRemove( this, NsdPackage.NOTICE__COPYRIGHT_NOTICE, + Notice.class, msgs ); + if( newNotice != null ) + msgs = ( ( InternalEObject ) newNotice ).eInverseAdd( this, NsdPackage.NOTICE__COPYRIGHT_NOTICE, + Notice.class, msgs ); msgs = basicSetNotice( newNotice, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldNoticeESet = noticeESet; noticeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.COPYRIGHT_NOTICE__NOTICE, newNotice, newNotice, !oldNoticeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.COPYRIGHT_NOTICE__NOTICE, newNotice, + newNotice, !oldNoticeESet ) ); } } @@ -200,8 +203,9 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic else { boolean oldNoticeESet = noticeESet; noticeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, null, oldNoticeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, + null, oldNoticeESet ) ); } } @@ -255,18 +259,21 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic public void setLicense( License newLicense ) { if( newLicense != license ) { NotificationChain msgs = null; - if( license != null ) msgs = ( ( InternalEObject ) license ).eInverseRemove( this, - NsdPackage.LICENSE__COPYRIGHT_NOTICE, License.class, msgs ); - if( newLicense != null ) msgs = ( ( InternalEObject ) newLicense ).eInverseAdd( this, - NsdPackage.LICENSE__COPYRIGHT_NOTICE, License.class, msgs ); + if( license != null ) + msgs = ( ( InternalEObject ) license ).eInverseRemove( this, NsdPackage.LICENSE__COPYRIGHT_NOTICE, + License.class, msgs ); + if( newLicense != null ) + msgs = ( ( InternalEObject ) newLicense ).eInverseAdd( this, NsdPackage.LICENSE__COPYRIGHT_NOTICE, + License.class, msgs ); msgs = basicSetLicense( newLicense, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldLicenseESet = licenseESet; licenseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.COPYRIGHT_NOTICE__LICENSE, newLicense, newLicense, !oldLicenseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.COPYRIGHT_NOTICE__LICENSE, + newLicense, newLicense, !oldLicenseESet ) ); } } @@ -308,8 +315,9 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic else { boolean oldLicenseESet = licenseESet; licenseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, null, oldLicenseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, + null, oldLicenseESet ) ); } } @@ -356,14 +364,17 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic if( EcoreUtil.isAncestor( this, newCopyrighted ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCopyrighted != null ) msgs = ( ( InternalEObject ) newCopyrighted ).eInverseAdd( this, - NsdPackage.COPYRIGHTED__COPYRIGHT, Copyrighted.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCopyrighted != null ) + msgs = ( ( InternalEObject ) newCopyrighted ).eInverseAdd( this, NsdPackage.COPYRIGHTED__COPYRIGHT, + Copyrighted.class, msgs ); msgs = basicSetCopyrighted( newCopyrighted, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, newCopyrighted, newCopyrighted ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, + newCopyrighted, newCopyrighted ) ); } /** @@ -375,15 +386,18 @@ public class CopyrightNoticeImpl extends NsdObjectImpl implements CopyrightNotic public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.COPYRIGHT_NOTICE__NOTICE: - if( notice != null ) msgs = ( ( InternalEObject ) notice ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, msgs ); + if( notice != null ) + msgs = ( ( InternalEObject ) notice ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__NOTICE, null, msgs ); return basicSetNotice( ( Notice ) otherEnd, msgs ); case NsdPackage.COPYRIGHT_NOTICE__LICENSE: - if( license != null ) msgs = ( ( InternalEObject ) license ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, msgs ); + if( license != null ) + msgs = ( ( InternalEObject ) license ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHT_NOTICE__LICENSE, null, msgs ); return basicSetLicense( ( License ) otherEnd, msgs ); case NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCopyrighted( ( Copyrighted ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java index e216f815e015b0c2418322200012dafe59e29e8c..6c4273c1fa573417806e6a77cb40ff161018fd68 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/CopyrightedImpl.java @@ -123,18 +123,21 @@ public class CopyrightedImpl extends NsdObjectImpl implements Copyrighted { public void setCopyright( CopyrightNotice newCopyright ) { if( newCopyright != copyright ) { NotificationChain msgs = null; - if( copyright != null ) msgs = ( ( InternalEObject ) copyright ).eInverseRemove( this, - NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, CopyrightNotice.class, msgs ); - if( newCopyright != null ) msgs = ( ( InternalEObject ) newCopyright ).eInverseAdd( this, - NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, CopyrightNotice.class, msgs ); + if( copyright != null ) + msgs = ( ( InternalEObject ) copyright ).eInverseRemove( this, NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, + CopyrightNotice.class, msgs ); + if( newCopyright != null ) + msgs = ( ( InternalEObject ) newCopyright ).eInverseAdd( this, NsdPackage.COPYRIGHT_NOTICE__COPYRIGHTED, + CopyrightNotice.class, msgs ); msgs = basicSetCopyright( newCopyright, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldCopyrightESet = copyrightESet; copyrightESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.COPYRIGHTED__COPYRIGHT, newCopyright, newCopyright, !oldCopyrightESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.COPYRIGHTED__COPYRIGHT, newCopyright, + newCopyright, !oldCopyrightESet ) ); } } @@ -176,8 +179,9 @@ public class CopyrightedImpl extends NsdObjectImpl implements Copyrighted { else { boolean oldCopyrightESet = copyrightESet; copyrightESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.COPYRIGHTED__COPYRIGHT, null, null, oldCopyrightESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.COPYRIGHTED__COPYRIGHT, null, null, + oldCopyrightESet ) ); } } @@ -200,8 +204,9 @@ public class CopyrightedImpl extends NsdObjectImpl implements Copyrighted { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.COPYRIGHTED__COPYRIGHT: - if( copyright != null ) msgs = ( ( InternalEObject ) copyright ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHTED__COPYRIGHT, null, msgs ); + if( copyright != null ) + msgs = ( ( InternalEObject ) copyright ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.COPYRIGHTED__COPYRIGHT, null, msgs ); return basicSetCopyright( ( CopyrightNotice ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java index 4781d724834a150d6c080409a0df1ff0bf254a28..a5b08d6137265a551e083d4ed3b768fe78221c3b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java @@ -29,6 +29,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint; +import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; @@ -762,8 +763,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib dchg = newDchg; boolean oldDchgESet = dchgESet; dchgESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, dchg, !oldDchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, dchg, + !oldDchgESet ) ); } /** @@ -777,8 +779,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldDchgESet = dchgESet; dchg = DCHG_EDEFAULT; dchgESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__DCHG, oldDchg, + DCHG_EDEFAULT, oldDchgESet ) ); } /** @@ -812,8 +815,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib defaultValue = newDefaultValue; boolean oldDefaultValueESet = defaultValueESet; defaultValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__DEFAULT_VALUE, + oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); } /** @@ -863,8 +867,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib dupd = newDupd; boolean oldDupdESet = dupdESet; dupdESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, dupd, !oldDupdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, dupd, + !oldDupdESet ) ); } /** @@ -878,8 +883,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldDupdESet = dupdESet; dupd = DUPD_EDEFAULT; dupdESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__DUPD, oldDupd, + DUPD_EDEFAULT, oldDupdESet ) ); } /** @@ -913,8 +919,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib fc = newFc; boolean oldFcESet = fcESet; fcESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__FC, oldFc, fc, !oldFcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__FC, oldFc, fc, + !oldFcESet ) ); } /** @@ -928,8 +935,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldFcESet = fcESet; fc = FC_EDEFAULT; fcESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__FC, oldFc, FC_EDEFAULT, oldFcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__FC, oldFc, FC_EDEFAULT, + oldFcESet ) ); } /** @@ -963,8 +971,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib isArray = newIsArray; boolean oldIsArrayESet = isArrayESet; isArrayESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, + isArray, !oldIsArrayESet ) ); } /** @@ -978,8 +987,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldIsArrayESet = isArrayESet; isArray = IS_ARRAY_EDEFAULT; isArrayESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, + IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); } /** @@ -1065,8 +1075,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib maxValue = newMaxValue; boolean oldMaxValueESet = maxValueESet; maxValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue, !oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, + maxValue, !oldMaxValueESet ) ); } /** @@ -1080,8 +1091,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldMaxValueESet = maxValueESet; maxValue = MAX_VALUE_EDEFAULT; maxValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, + MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); } /** @@ -1115,8 +1127,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib minIndex = newMinIndex; boolean oldMinIndexESet = minIndexESet; minIndexESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, + minIndex, !oldMinIndexESet ) ); } /** @@ -1130,8 +1143,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldMinIndexESet = minIndexESet; minIndex = MIN_INDEX_EDEFAULT; minIndexESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, + MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); } /** @@ -1165,8 +1179,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib minValue = newMinValue; boolean oldMinValueESet = minValueESet; minValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue, !oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, + minValue, !oldMinValueESet ) ); } /** @@ -1180,8 +1195,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldMinValueESet = minValueESet; minValue = MIN_VALUE_EDEFAULT; minValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, + MIN_VALUE_EDEFAULT, oldMinValueESet ) ); } /** @@ -1215,8 +1231,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -1230,8 +1247,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -1265,8 +1283,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, + presCond, !oldPresCondESet ) ); } /** @@ -1280,8 +1299,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__PRES_COND, oldPresCond, + PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -1315,8 +1335,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib presCondArgs = newPresCondArgs; boolean oldPresCondArgsESet = presCondArgsESet; presCondArgsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__PRES_COND_ARGS, + oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); } /** @@ -1418,8 +1439,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib qchg = newQchg; boolean oldQchgESet = qchgESet; qchgESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, qchg, !oldQchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, qchg, + !oldQchgESet ) ); } /** @@ -1433,8 +1455,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldQchgESet = qchgESet; qchg = QCHG_EDEFAULT; qchgESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__QCHG, oldQchg, + QCHG_EDEFAULT, oldQchgESet ) ); } /** @@ -1468,8 +1491,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib sizeAttribute = newSizeAttribute; boolean oldSizeAttributeESet = sizeAttributeESet; sizeAttributeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__SIZE_ATTRIBUTE, + oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); } /** @@ -1519,8 +1543,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -1534,8 +1559,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -1569,8 +1595,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib typeKind = newTypeKind; boolean oldTypeKindESet = typeKindESet; typeKindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, + typeKind, !oldTypeKindESet ) ); } /** @@ -1584,8 +1611,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib boolean oldTypeKindESet = typeKindESet; typeKind = TYPE_KIND_EDEFAULT; typeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, + TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); } /** @@ -1631,9 +1659,11 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib if( EcoreUtil.isAncestor( this, newCDC ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCDC != null ) msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, - NsdPackage.CDC__DATA_ATTRIBUTE, CDC.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCDC != null ) + msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, NsdPackage.CDC__DATA_ATTRIBUTE, CDC.class, + msgs ); msgs = basicSetCDC( newCDC, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -1772,9 +1802,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToFunctionalConstraintESet = refersToFunctionalConstraintESet; refersToFunctionalConstraintESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, newRefersToFunctionalConstraint, - newRefersToFunctionalConstraint, !oldRefersToFunctionalConstraintESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, newRefersToFunctionalConstraint, + newRefersToFunctionalConstraint, !oldRefersToFunctionalConstraintESet ) ); } } @@ -1817,9 +1848,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToFunctionalConstraintESet = refersToFunctionalConstraintESet; refersToFunctionalConstraintESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, null, null, - oldRefersToFunctionalConstraintESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_FUNCTIONAL_CONSTRAINT, null, null, + oldRefersToFunctionalConstraintESet ) ); } } @@ -1887,9 +1919,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, - newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, + newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); } } @@ -1932,9 +1965,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, null, null, - oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, null, null, + oldRefersToPresenceConditionESet ) ); } } @@ -2004,9 +2038,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToSizeAttributeESet = refersToSizeAttributeESet; refersToSizeAttributeESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, - newRefersToSizeAttribute, newRefersToSizeAttribute, !oldRefersToSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, newRefersToSizeAttribute, + newRefersToSizeAttribute, !oldRefersToSizeAttributeESet ) ); } } @@ -2050,8 +2085,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToSizeAttributeESet = refersToSizeAttributeESet; refersToSizeAttributeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, null, null, oldRefersToSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_SIZE_ATTRIBUTE, null, null, + oldRefersToSizeAttributeESet ) ); } } @@ -2121,9 +2158,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToMaxIndexAttributeESet = refersToMaxIndexAttributeESet; refersToMaxIndexAttributeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, newRefersToMaxIndexAttribute, - newRefersToMaxIndexAttribute, !oldRefersToMaxIndexAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, newRefersToMaxIndexAttribute, + newRefersToMaxIndexAttribute, !oldRefersToMaxIndexAttributeESet ) ); } } @@ -2167,9 +2205,10 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToMaxIndexAttributeESet = refersToMaxIndexAttributeESet; refersToMaxIndexAttributeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, null, null, - oldRefersToMaxIndexAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_MAX_INDEX_ATTRIBUTE, null, null, + oldRefersToMaxIndexAttributeESet ) ); } } @@ -2299,10 +2338,12 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib public void setRefersToBasicType( BasicType newRefersToBasicType ) { if( newRefersToBasicType != refersToBasicType ) { NotificationChain msgs = null; - if( refersToBasicType != null ) msgs = ( ( InternalEObject ) refersToBasicType ).eInverseRemove( this, - NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); - if( newRefersToBasicType != null ) msgs = ( ( InternalEObject ) newRefersToBasicType ).eInverseAdd( this, - NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); + if( refersToBasicType != null ) + msgs = ( ( InternalEObject ) refersToBasicType ).eInverseRemove( this, + NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); + if( newRefersToBasicType != null ) + msgs = ( ( InternalEObject ) newRefersToBasicType ).eInverseAdd( this, + NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); msgs = basicSetRefersToBasicType( newRefersToBasicType, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -2354,8 +2395,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib else { boolean oldRefersToBasicTypeESet = refersToBasicTypeESet; refersToBasicTypeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_ATTRIBUTE__REFERS_TO_BASIC_TYPE, null, null, oldRefersToBasicTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_ATTRIBUTE__REFERS_TO_BASIC_TYPE, null, null, oldRefersToBasicTypeESet ) ); } } @@ -2379,7 +2421,8 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.DATA_ATTRIBUTE__CDC: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCDC( ( CDC ) otherEnd, msgs ); case NsdPackage.DATA_ATTRIBUTE__REFERRED_BY_SUB_DATA_OBJECT_AS_SIZE_ATTRIBUTE: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredBySubDataObjectAsSizeAttribute() ) @@ -2417,8 +2460,9 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDataAttributeAsMaxIndexAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.DATA_ATTRIBUTE__REFERS_TO_BASIC_TYPE: - if( refersToBasicType != null ) msgs = ( ( InternalEObject ) refersToBasicType ).eInverseRemove( this, - NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); + if( refersToBasicType != null ) + msgs = ( ( InternalEObject ) refersToBasicType ).eInverseRemove( this, + NsdPackage.BASIC_TYPE__REFERRED_BY_DATA_ATTRIBUTE, BasicType.class, msgs ); return basicSetRefersToBasicType( ( BasicType ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); @@ -3046,71 +3090,90 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; + NS ns = getCDC().getCDCs().getNS(); + if( isSetFc() ) { - setRefersToFunctionalConstraint( getCDC().getCDCs().getNS().findFunctionalConstraint( getFc(), console ) ); - if( getRefersToFunctionalConstraint() == null ) { + FunctionalConstraint foundFC = ns.findFunctionalConstraint( getFc(), console ); + + if( foundFC == null ) { console.error( "FunctionalConstraint (abbreviation: " + getFc() + ") refers by DataAttribute (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToFunctionalConstraint( foundFC ); console.verbose( "FunctionalConstraint (abbreviation: " + getFc() + ") refers by DataAttribute (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToFunctionalConstraint().getFunctionalConstraints().getNS().getId() + ")" ); } } if( isSetPresCond() ) { - setRefersToPresenceCondition( getCDC().getCDCs().getNS().findPresenceCondition( getPresCond(), console ) ); - if( getRefersToPresenceCondition() == null ) { + PresenceCondition foundPC = ns.findPresenceCondition( getPresCond(), console ); + + if( foundPC == null ) { console.error( "PresenceCondition (name: " + getPresCond() + ") refers by DataAttribute (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToPresenceCondition( foundPC ); console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by DataAttribute (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } } if( isSetSizeAttribute() ) { - setRefersToSizeAttribute( getCDC().getDataAttribute().stream() - .filter( att -> att.getName().equals( getSizeAttribute() ) ).findAny().orElse( null ) ); - if( getRefersToSizeAttribute() == null ) { - console.error( "DataAttribute (name: " + getSizeAttribute() + getCDC() + .getDataAttribute() + .stream() + .filter( att -> att.getName().equals( getSizeAttribute() ) ) + .findAny() + .ifPresent( att -> setRefersToSizeAttribute( att ) ); + + if( isSetRefersToSizeAttribute() ) { + console.verbose( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by DataAttribute (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + ns.getId() + ") found" ); } else { - console.verbose( "DataAttribute (name: " + getSizeAttribute() + console.error( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by DataAttribute (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") found" ); + + ns.getId() + ") is unknown" ); } } if( isSetMaxIndexAttribute() ) { - setRefersToMaxIndexAttribute( getCDC().getDataAttribute().stream() - .filter( att -> att.getName().equals( getMaxIndexAttribute() ) ).findAny().orElse( null ) ); - if( getRefersToMaxIndexAttribute() == null ) { - console.error( "DataAttribute (name: " + getMaxIndexAttribute() + getCDC() + .getDataAttribute() + .stream() + .filter( att -> att.getName().equals( getMaxIndexAttribute() ) ) + .findAny() + .ifPresent( att -> setRefersToMaxIndexAttribute( att ) ); + + if( isSetRefersToMaxIndexAttribute() ) { + console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by DataAttribute (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + ns.getId() + ") found" ); } else { - console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + console.error( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by DataAttribute (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") found" ); + + ns.getId() + ") is unknown" ); } } if( getTypeKind().equals( DefinedAttributeTypeKind.BASIC ) ) { - setRefersToBasicType( getCDC().getCDCs().getNS().findBasicType( getType(), console ) ); - if( getRefersToBasicType() == null ) { + BasicType foundBT = ns.findBasicType( getType(), console ); + + if( foundBT == null ) { console.error( "BasicType (name: " + getType() + ") refers as type by DataAttribute (name: " + getName() - + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToBasicType( foundBT ); console.verbose( "BasicType (name: " + getType() + ") refers as type by DataAttribute (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found" ); + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + + getRefersToBasicType().getBasicTypes().getNS().getId() + ")" ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java index d9c234216d9c8d7040661ff9c91a46ac79ea6a34..3604ea237fc15fd59e34af59c86916c9c86456dd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java @@ -26,6 +26,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind; +import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition; @@ -484,8 +485,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { dsPresCond = newDsPresCond; boolean oldDsPresCondESet = dsPresCondESet; dsPresCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__DS_PRES_COND, oldDsPresCond, dsPresCond, !oldDsPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__DS_PRES_COND, oldDsPresCond, + dsPresCond, !oldDsPresCondESet ) ); } /** @@ -499,8 +501,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { boolean oldDsPresCondESet = dsPresCondESet; dsPresCond = DS_PRES_COND_EDEFAULT; dsPresCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__DS_PRES_COND, oldDsPresCond, DS_PRES_COND_EDEFAULT, oldDsPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__DS_PRES_COND, + oldDsPresCond, DS_PRES_COND_EDEFAULT, oldDsPresCondESet ) ); } /** @@ -638,8 +641,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -653,8 +657,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -688,8 +693,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, + presCond, !oldPresCondESet ) ); } /** @@ -703,8 +709,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__PRES_COND, oldPresCond, + PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -738,8 +745,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { presCondArgs = newPresCondArgs; boolean oldPresCondArgsESet = presCondArgsESet; presCondArgsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__PRES_COND_ARGS, + oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); } /** @@ -841,8 +849,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { transient_ = newTransient; boolean oldTransientESet = transientESet; transientESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, transient_, !oldTransientESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, + transient_, !oldTransientESet ) ); } /** @@ -856,8 +865,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { boolean oldTransientESet = transientESet; transient_ = TRANSIENT_EDEFAULT; transientESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, TRANSIENT_EDEFAULT, oldTransientESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__TRANSIENT, oldTransient, + TRANSIENT_EDEFAULT, oldTransientESet ) ); } /** @@ -891,8 +901,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -906,8 +917,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -941,8 +953,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { underlyingType = newUnderlyingType; boolean oldUnderlyingTypeESet = underlyingTypeESet; underlyingTypeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__UNDERLYING_TYPE, oldUnderlyingType, underlyingType, !oldUnderlyingTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__UNDERLYING_TYPE, + oldUnderlyingType, underlyingType, !oldUnderlyingTypeESet ) ); } /** @@ -1056,14 +1069,17 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { if( EcoreUtil.isAncestor( this, newAnyLNClass ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newAnyLNClass != null ) msgs = ( ( InternalEObject ) newAnyLNClass ).eInverseAdd( this, - NsdPackage.ANY_LN_CLASS__DATA_OBJECT, AnyLNClass.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newAnyLNClass != null ) + msgs = ( ( InternalEObject ) newAnyLNClass ).eInverseAdd( this, NsdPackage.ANY_LN_CLASS__DATA_OBJECT, + AnyLNClass.class, msgs ); msgs = basicSetAnyLNClass( newAnyLNClass, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__ANY_LN_CLASS, newAnyLNClass, newAnyLNClass ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__ANY_LN_CLASS, newAnyLNClass, + newAnyLNClass ) ); } /** @@ -1106,18 +1122,21 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { public void setRefersToCDC( CDC newRefersToCDC ) { if( newRefersToCDC != refersToCDC ) { NotificationChain msgs = null; - if( refersToCDC != null ) msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, - NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); - if( newRefersToCDC != null ) msgs = ( ( InternalEObject ) newRefersToCDC ).eInverseAdd( this, - NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); + if( refersToCDC != null ) + msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, + NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); + if( newRefersToCDC != null ) + msgs = ( ( InternalEObject ) newRefersToCDC ).eInverseAdd( this, + NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); msgs = basicSetRefersToCDC( newRefersToCDC, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldRefersToCDCESet = refersToCDCESet; refersToCDCESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__REFERS_TO_CDC, newRefersToCDC, newRefersToCDC, !oldRefersToCDCESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_OBJECT__REFERS_TO_CDC, + newRefersToCDC, newRefersToCDC, !oldRefersToCDCESet ) ); } } @@ -1159,8 +1178,9 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { else { boolean oldRefersToCDCESet = refersToCDCESet; refersToCDCESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__REFERS_TO_CDC, null, null, oldRefersToCDCESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_OBJECT__REFERS_TO_CDC, null, + null, oldRefersToCDCESet ) ); } } @@ -1228,9 +1248,10 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, - newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, + newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); } } @@ -1273,9 +1294,10 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, null, null, - oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, null, null, + oldRefersToPresenceConditionESet ) ); } } @@ -1348,10 +1370,11 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { else { boolean oldRefersToPresenceConditionDerivedStatisticsESet = refersToPresenceConditionDerivedStatisticsESet; refersToPresenceConditionDerivedStatisticsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, - newRefersToPresenceConditionDerivedStatistics, newRefersToPresenceConditionDerivedStatistics, - !oldRefersToPresenceConditionDerivedStatisticsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, + newRefersToPresenceConditionDerivedStatistics, newRefersToPresenceConditionDerivedStatistics, + !oldRefersToPresenceConditionDerivedStatisticsESet ) ); } } @@ -1396,9 +1419,10 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { else { boolean oldRefersToPresenceConditionDerivedStatisticsESet = refersToPresenceConditionDerivedStatisticsESet; refersToPresenceConditionDerivedStatisticsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, null, null, - oldRefersToPresenceConditionDerivedStatisticsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION_DERIVED_STATISTICS, null, null, + oldRefersToPresenceConditionDerivedStatisticsESet ) ); } } @@ -1421,11 +1445,13 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.DATA_OBJECT__ANY_LN_CLASS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetAnyLNClass( ( AnyLNClass ) otherEnd, msgs ); case NsdPackage.DATA_OBJECT__REFERS_TO_CDC: - if( refersToCDC != null ) msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, - NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); + if( refersToCDC != null ) + msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, + NsdPackage.CDC__REFERRED_BY_DATA_OBJECT, CDC.class, msgs ); return basicSetRefersToCDC( ( CDC ) otherEnd, msgs ); case NsdPackage.DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION: if( refersToPresenceCondition != null ) @@ -1841,44 +1867,46 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; + NS ns = getAnyLNClass().getLNClasses().getNS(); if( isSetType() ) { - setRefersToCDC( getAnyLNClass().getLNClasses().getNS().findCDC( getType(), console ) ); - if( getRefersToCDC() == null ) { + CDC foundCDC = ns.findCDC( getType(), console ); + + if( foundCDC == null ) { console.error( "CDC (name: " + getType() + ") refers by DataObject (name: " + getName() + ") in NS (id:" - + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); + + ns.getId() + ") is unknown" ); } else { + setRefersToCDC( foundCDC ); console.verbose( "CDC (name: " + getType() + ") refers by DataObject (name: " + getName() - + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" + + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToCDC().getCDCs().getNS().getId() + ")" ); } } if( isSetPresCond() ) { - setRefersToPresenceCondition( - getAnyLNClass().getLNClasses().getNS().findPresenceCondition( getPresCond(), console ) ); - if( getRefersToPresenceCondition() == null ) { - console.error( - "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + getName() - + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); + PresenceCondition foundPC = ns.findPresenceCondition( getPresCond(), console ); + + if( foundPC == null ) { + console.error( "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { - console.verbose( - "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + getName() - + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" - + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); + setRefersToPresenceCondition( foundPC ); + console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } } if( isSetDsPresCond() ) { - setRefersToPresenceConditionDerivedStatistics( - getAnyLNClass().getLNClasses().getNS().findPresenceCondition( getDsPresCond(), console ) ); - if( getRefersToPresenceConditionDerivedStatistics() == null ) { + PresenceCondition foundPC = ns.findPresenceCondition( getDsPresCond(), console ); + if( foundPC == null ) { console.error( "PresenceCondition (name: " + getDsPresCond() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); } else { + setRefersToPresenceConditionDerivedStatistics( foundPC ); console.verbose( "PresenceCondition (name: " + getDsPresCond() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java index 239de22c46e641b436b8ea269856afecd1869531..b7f709cd898c31f2bd12c4307f32cd0b875c2a60 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataSetMemberOfImpl.java @@ -117,8 +117,9 @@ public class DataSetMemberOfImpl extends NsdObjectImpl implements DataSetMemberO cb = newCb == null ? CB_EDEFAULT : newCb; boolean oldCbESet = cbESet; cbESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, cb, !oldCbESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, cb, + !oldCbESet ) ); } /** @@ -132,8 +133,9 @@ public class DataSetMemberOfImpl extends NsdObjectImpl implements DataSetMemberO boolean oldCbESet = cbESet; cb = CB_EDEFAULT; cbESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, CB_EDEFAULT, oldCbESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DATA_SET_MEMBER_OF__CB, oldCb, + CB_EDEFAULT, oldCbESet ) ); } /** @@ -182,14 +184,17 @@ public class DataSetMemberOfImpl extends NsdObjectImpl implements DataSetMemberO if( EcoreUtil.isAncestor( this, newApplicableServices ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newApplicableServices != null ) msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, - NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF, ApplicableServices.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newApplicableServices != null ) + msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, + NsdPackage.APPLICABLE_SERVICES__DATA_SET_MEMBER_OF, ApplicableServices.class, msgs ); msgs = basicSetApplicableServices( newApplicableServices, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DATA_SET_MEMBER_OF__APPLICABLE_SERVICES, newApplicableServices, newApplicableServices ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DATA_SET_MEMBER_OF__APPLICABLE_SERVICES, + newApplicableServices, newApplicableServices ) ); } /** @@ -201,7 +206,8 @@ public class DataSetMemberOfImpl extends NsdObjectImpl implements DataSetMemberO public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.DATA_SET_MEMBER_OF__APPLICABLE_SERVICES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetApplicableServices( ( ApplicableServices ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java index b49f0485836d0170a04836b3efa0365d43ccba1a..cb881e63fd95c4bda5badf58741b365734e735f2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java @@ -245,8 +245,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DEPENDS_ON__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__RELEASE, oldRelease, release, + !oldReleaseESet ) ); } /** @@ -260,8 +261,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DEPENDS_ON__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DEPENDS_ON__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -295,8 +297,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DEPENDS_ON__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__VERSION, oldVersion, version, + !oldVersionESet ) ); } /** @@ -310,8 +313,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DEPENDS_ON__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DEPENDS_ON__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** @@ -345,8 +349,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { id = newId; boolean oldIdESet = idESet; idESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__ID, oldId, id, !oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__ID, oldId, id, + !oldIdESet ) ); } /** @@ -360,8 +365,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DEPENDS_ON__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DEPENDS_ON__ID, oldId, ID_EDEFAULT, + oldIdESet ) ); } /** @@ -395,8 +401,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DEPENDS_ON__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__REVISION, oldRevision, + revision, !oldRevisionESet ) ); } /** @@ -410,8 +417,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DEPENDS_ON__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DEPENDS_ON__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -508,7 +516,8 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__DEPENDS_ON, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -558,18 +567,21 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { public void setRefersToNS( NS newRefersToNS ) { if( newRefersToNS != refersToNS ) { NotificationChain msgs = null; - if( refersToNS != null ) msgs = ( ( InternalEObject ) refersToNS ).eInverseRemove( this, - NsdPackage.NS__REFERRED_BY_DEPENDS_ON, NS.class, msgs ); - if( newRefersToNS != null ) msgs = ( ( InternalEObject ) newRefersToNS ).eInverseAdd( this, - NsdPackage.NS__REFERRED_BY_DEPENDS_ON, NS.class, msgs ); + if( refersToNS != null ) + msgs = ( ( InternalEObject ) refersToNS ).eInverseRemove( this, NsdPackage.NS__REFERRED_BY_DEPENDS_ON, + NS.class, msgs ); + if( newRefersToNS != null ) + msgs = ( ( InternalEObject ) newRefersToNS ).eInverseAdd( this, NsdPackage.NS__REFERRED_BY_DEPENDS_ON, + NS.class, msgs ); msgs = basicSetRefersToNS( newRefersToNS, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldRefersToNSESet = refersToNSESet; refersToNSESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DEPENDS_ON__REFERS_TO_NS, newRefersToNS, newRefersToNS, !oldRefersToNSESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DEPENDS_ON__REFERS_TO_NS, + newRefersToNS, newRefersToNS, !oldRefersToNSESet ) ); } } @@ -611,8 +623,9 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { else { boolean oldRefersToNSESet = refersToNSESet; refersToNSESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DEPENDS_ON__REFERS_TO_NS, null, null, oldRefersToNSESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DEPENDS_ON__REFERS_TO_NS, null, + null, oldRefersToNSESet ) ); } } @@ -635,11 +648,13 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.DEPENDS_ON__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); case NsdPackage.DEPENDS_ON__REFERS_TO_NS: - if( refersToNS != null ) msgs = ( ( InternalEObject ) refersToNS ).eInverseRemove( this, - NsdPackage.NS__REFERRED_BY_DEPENDS_ON, NS.class, msgs ); + if( refersToNS != null ) + msgs = ( ( InternalEObject ) refersToNS ).eInverseRemove( this, NsdPackage.NS__REFERRED_BY_DEPENDS_ON, + NS.class, msgs ); return basicSetRefersToNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); @@ -891,13 +906,13 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; - NsdResourceSetImpl resourceSet = ( NsdResourceSetImpl ) eResource().getResourceSet(); - setRefersToNS( resourceSet.getNS( getId() ) ); - if( getRefersToNS() == null ) { + NS ns = ( ( NsdResourceSetImpl ) eResource().getResourceSet() ).getNS( getId() ); + if( ns == null ) { console.error( "NS (id: " + getId() + ") and refers by DependsOn in NS (id:" + getNS().getId() + ") is unknown" ); } else { + setRefersToNS( ns ); console.verbose( "NS (id: " + getId() + ") and refers by DependsOn in NS (id:" + getNS().getId() + ") found" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java index ae611e714ac477d4f4dd90d6aae926b88d8f872c..c4c74de3bc19d6a3ad266abe6e259b622d8345cc 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocImpl.java @@ -180,8 +180,9 @@ public class DocImpl extends NsdObjectImpl implements Doc { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.DOC__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DOC__ID, oldId, ID_EDEFAULT, + oldIdESet ) ); } /** @@ -227,7 +228,8 @@ public class DocImpl extends NsdObjectImpl implements Doc { if( EcoreUtil.isAncestor( this, newNSDoc ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNSDoc != null ) msgs = ( ( InternalEObject ) newNSDoc ).eInverseAdd( this, NsdPackage.NS_DOC__DOC, NSDoc.class, msgs ); msgs = basicSetNSDoc( newNSDoc, msgs ); @@ -246,7 +248,8 @@ public class DocImpl extends NsdObjectImpl implements Doc { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.DOC__NS_DOC: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNSDoc( ( NSDoc ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java index 10409e80b84b8be8f80258cbabd16f94b4b1ac56..d619dc1bbaaa2bc49e2546df6e988cf5e25f06aa 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DocumentedClassImpl.java @@ -171,8 +171,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas deprecated = newDeprecated; boolean oldDeprecatedESet = deprecatedESet; deprecatedESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DOCUMENTED_CLASS__DEPRECATED, oldDeprecated, deprecated, !oldDeprecatedESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DOCUMENTED_CLASS__DEPRECATED, + oldDeprecated, deprecated, !oldDeprecatedESet ) ); } /** @@ -186,8 +187,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas boolean oldDeprecatedESet = deprecatedESet; deprecated = DEPRECATED_EDEFAULT; deprecatedESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DOCUMENTED_CLASS__DEPRECATED, oldDeprecated, DEPRECATED_EDEFAULT, oldDeprecatedESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DOCUMENTED_CLASS__DEPRECATED, + oldDeprecated, DEPRECATED_EDEFAULT, oldDeprecatedESet ) ); } /** @@ -221,8 +223,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DOCUMENTED_CLASS__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DOCUMENTED_CLASS__DESC_ID, oldDescID, + descID, !oldDescIDESet ) ); } /** @@ -236,8 +239,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DOCUMENTED_CLASS__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DOCUMENTED_CLASS__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -271,8 +275,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas informative = newInformative; boolean oldInformativeESet = informativeESet; informativeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, oldInformative, informative, !oldInformativeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, + oldInformative, informative, !oldInformativeESet ) ); } /** @@ -286,8 +291,9 @@ public class DocumentedClassImpl extends NsdObjectImpl implements DocumentedClas boolean oldInformativeESet = informativeESet; informative = INFORMATIVE_EDEFAULT; informativeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, oldInformative, INFORMATIVE_EDEFAULT, oldInformativeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.DOCUMENTED_CLASS__INFORMATIVE, + oldInformative, INFORMATIVE_EDEFAULT, oldInformativeESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java index e10140cabd29a0b71994479244814b8973d0b125..36765ced1f0ba13a89c0e8616d694ad4880c868d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java @@ -22,6 +22,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.impl; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumeration; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Enumerations; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.Literal; +import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; @@ -231,8 +232,9 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { inheritedFrom = newInheritedFrom; boolean oldInheritedFromESet = inheritedFromESet; inheritedFromESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ENUMERATION__INHERITED_FROM, oldInheritedFrom, inheritedFrom, !oldInheritedFromESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ENUMERATION__INHERITED_FROM, + oldInheritedFrom, inheritedFrom, !oldInheritedFromESet ) ); } /** @@ -282,8 +284,9 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ENUMERATION__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ENUMERATION__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -297,8 +300,9 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ENUMERATION__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.ENUMERATION__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -344,14 +348,17 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { if( EcoreUtil.isAncestor( this, newEnumerations ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newEnumerations != null ) msgs = ( ( InternalEObject ) newEnumerations ).eInverseAdd( this, - NsdPackage.ENUMERATIONS__ENUMERATION, Enumerations.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newEnumerations != null ) + msgs = ( ( InternalEObject ) newEnumerations ).eInverseAdd( this, NsdPackage.ENUMERATIONS__ENUMERATION, + Enumerations.class, msgs ); msgs = basicSetEnumerations( newEnumerations, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.ENUMERATION__ENUMERATIONS, newEnumerations, newEnumerations ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.ENUMERATION__ENUMERATIONS, + newEnumerations, newEnumerations ) ); } /** @@ -408,9 +415,10 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { else { boolean oldRefersToBaseEnumerationESet = refersToBaseEnumerationESet; refersToBaseEnumerationESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.ENUMERATION__REFERS_TO_BASE_ENUMERATION, - newRefersToBaseEnumeration, newRefersToBaseEnumeration, !oldRefersToBaseEnumerationESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.ENUMERATION__REFERS_TO_BASE_ENUMERATION, newRefersToBaseEnumeration, + newRefersToBaseEnumeration, !oldRefersToBaseEnumerationESet ) ); } } @@ -453,8 +461,10 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { else { boolean oldRefersToBaseEnumerationESet = refersToBaseEnumerationESet; refersToBaseEnumerationESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.ENUMERATION__REFERS_TO_BASE_ENUMERATION, null, null, oldRefersToBaseEnumerationESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.ENUMERATION__REFERS_TO_BASE_ENUMERATION, null, null, + oldRefersToBaseEnumerationESet ) ); } } @@ -518,7 +528,8 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLiteral() ).basicAdd( otherEnd, msgs ); case NsdPackage.ENUMERATION__ENUMERATIONS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetEnumerations( ( Enumerations ) otherEnd, msgs ); case NsdPackage.ENUMERATION__REFERS_TO_BASE_ENUMERATION: if( refersToBaseEnumeration != null ) @@ -709,15 +720,17 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; + NS ns = getEnumerations().getNS(); if( isSetInheritedFrom() ) { - setRefersToBaseEnumeration( getEnumerations().getNS().findEnumeration( getInheritedFrom(), console ) ); - if( getRefersToBaseEnumeration() == null ) { + Enumeration foundBase = ns.findEnumeration( getInheritedFrom(), console ); + if( foundBase == null ) { console.error( "Enumeration (name: " + getInheritedFrom() + ") refers by Enumeration (name: " - + getName() + ") in NS (id:" + getEnumerations().getNS().getId() + ") is unknown" ); + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToBaseEnumeration( foundBase ); console.verbose( "Enumeration (name: " + getInheritedFrom() + ") refers by Enumeration (name: " - + getName() + ") in NS (id:" + getEnumerations().getNS().getId() + ") found in NS (id:" + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToBaseEnumeration().getEnumerations().getNS().getId() + ")" ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java index 1ad71ede35e27c5a8f90d4c3e3b1b80e7557fb1f..75e9c9314b5e6aaa158e2daedea25834b63ad07f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationsImpl.java @@ -150,7 +150,8 @@ public class EnumerationsImpl extends NsdObjectImpl implements Enumerations { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__ENUMERATIONS, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -173,7 +174,8 @@ public class EnumerationsImpl extends NsdObjectImpl implements Enumerations { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEnumeration() ).basicAdd( otherEnd, msgs ); case NsdPackage.ENUMERATIONS__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java index 0b42ad52bd244e5cb8fb3383c810e6f9236505a5..4d20a1a8f4ad4f83f4317def7229b7fef8f2546e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintImpl.java @@ -234,19 +234,22 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona public void setApplicableServices( ApplicableServices newApplicableServices ) { if( newApplicableServices != applicableServices ) { NotificationChain msgs = null; - if( applicableServices != null ) msgs = ( ( InternalEObject ) applicableServices ).eInverseRemove( this, - NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, ApplicableServices.class, msgs ); - if( newApplicableServices != null ) msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, - NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, ApplicableServices.class, msgs ); + if( applicableServices != null ) + msgs = ( ( InternalEObject ) applicableServices ).eInverseRemove( this, + NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, ApplicableServices.class, msgs ); + if( newApplicableServices != null ) + msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, + NsdPackage.APPLICABLE_SERVICES__FUNCTIONAL_CONSTRAINT, ApplicableServices.class, msgs ); msgs = basicSetApplicableServices( newApplicableServices, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldApplicableServicesESet = applicableServicesESet; applicableServicesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, newApplicableServices, newApplicableServices, - !oldApplicableServicesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, newApplicableServices, + newApplicableServices, !oldApplicableServicesESet ) ); } } @@ -289,8 +292,10 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona else { boolean oldApplicableServicesESet = applicableServicesESet; applicableServicesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, null, oldApplicableServicesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, null, + oldApplicableServicesESet ) ); } } @@ -325,8 +330,9 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona abbreviation = newAbbreviation; boolean oldAbbreviationESet = abbreviationESet; abbreviationESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION, oldAbbreviation, abbreviation, !oldAbbreviationESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINT__ABBREVIATION, + oldAbbreviation, abbreviation, !oldAbbreviationESet ) ); } /** @@ -376,8 +382,9 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID, + oldDescID, descID, !oldDescIDESet ) ); } /** @@ -391,8 +398,9 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.FUNCTIONAL_CONSTRAINT__DESC_ID, + oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -426,8 +434,9 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona titleID = newTitleID; boolean oldTitleIDESet = titleIDESet; titleIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID, oldTitleID, titleID, !oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID, + oldTitleID, titleID, !oldTitleIDESet ) ); } /** @@ -441,8 +450,9 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona boolean oldTitleIDESet = titleIDESet; titleID = TITLE_ID_EDEFAULT; titleIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID, oldTitleID, TITLE_ID_EDEFAULT, oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.FUNCTIONAL_CONSTRAINT__TITLE_ID, + oldTitleID, TITLE_ID_EDEFAULT, oldTitleIDESet ) ); } /** @@ -491,16 +501,18 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona if( EcoreUtil.isAncestor( this, newFunctionalConstraints ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newFunctionalConstraints != null ) msgs = ( ( InternalEObject ) newFunctionalConstraints ).eInverseAdd( this, NsdPackage.FUNCTIONAL_CONSTRAINTS__FUNCTIONAL_CONSTRAINT, FunctionalConstraints.class, msgs ); msgs = basicSetFunctionalConstraints( newFunctionalConstraints, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINT__FUNCTIONAL_CONSTRAINTS, - newFunctionalConstraints, newFunctionalConstraints ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.FUNCTIONAL_CONSTRAINT__FUNCTIONAL_CONSTRAINTS, newFunctionalConstraints, + newFunctionalConstraints ) ); } /** @@ -548,11 +560,13 @@ public class FunctionalConstraintImpl extends NsdObjectImpl implements Functiona public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES: - if( applicableServices != null ) msgs = ( ( InternalEObject ) applicableServices ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs ); + if( applicableServices != null ) + msgs = ( ( InternalEObject ) applicableServices ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.FUNCTIONAL_CONSTRAINT__APPLICABLE_SERVICES, null, msgs ); return basicSetApplicableServices( ( ApplicableServices ) otherEnd, msgs ); case NsdPackage.FUNCTIONAL_CONSTRAINT__FUNCTIONAL_CONSTRAINTS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetFunctionalConstraints( ( FunctionalConstraints ) otherEnd, msgs ); case NsdPackage.FUNCTIONAL_CONSTRAINT__REFERRED_BY_DATA_ATTRIBUTE: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDataAttribute() ) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java index 33a170620c88a61f3b0b4c8c3d3d0713de4b6787..859dd21cf22717d29b5f0fac7cb40e7be1eae998 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/FunctionalConstraintsImpl.java @@ -153,14 +153,17 @@ public class FunctionalConstraintsImpl extends NsdObjectImpl implements Function if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, NS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newNS != null ) + msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, NS.class, + msgs ); msgs = basicSetNS( newNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, newNS, newNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, newNS, + newNS ) ); } /** @@ -198,14 +201,17 @@ public class FunctionalConstraintsImpl extends NsdObjectImpl implements Function if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, + NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.FUNCTIONAL_CONSTRAINTS__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.FUNCTIONAL_CONSTRAINTS__SERVICE_NS, + newServiceNS, newServiceNS ) ); } /** @@ -221,10 +227,12 @@ public class FunctionalConstraintsImpl extends NsdObjectImpl implements Function return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFunctionalConstraint() ) .basicAdd( otherEnd, msgs ); case NsdPackage.FUNCTIONAL_CONSTRAINTS__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); case NsdPackage.FUNCTIONAL_CONSTRAINTS__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java index 65803cec5f7625b276b81178880efd3ecd43e91d..8785ef786e90c56847ba23138389735290d3164a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassImpl.java @@ -176,8 +176,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { canHaveLOG = newCanHaveLOG; boolean oldCanHaveLOGESet = canHaveLOGESet; canHaveLOGESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, canHaveLOG, !oldCanHaveLOGESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, + canHaveLOG, !oldCanHaveLOGESet ) ); } /** @@ -191,8 +192,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { boolean oldCanHaveLOGESet = canHaveLOGESet; canHaveLOG = CAN_HAVE_LOG_EDEFAULT; canHaveLOGESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, CAN_HAVE_LOG_EDEFAULT, oldCanHaveLOGESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LN_CLASS__CAN_HAVE_LOG, oldCanHaveLOG, + CAN_HAVE_LOG_EDEFAULT, oldCanHaveLOGESet ) ); } /** @@ -226,8 +228,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { isExtension = newIsExtension; boolean oldIsExtensionESet = isExtensionESet; isExtensionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, isExtension, !oldIsExtensionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, + isExtension, !oldIsExtensionESet ) ); } /** @@ -241,8 +244,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { boolean oldIsExtensionESet = isExtensionESet; isExtension = IS_EXTENSION_EDEFAULT; isExtensionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, IS_EXTENSION_EDEFAULT, oldIsExtensionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LN_CLASS__IS_EXTENSION, oldIsExtension, + IS_EXTENSION_EDEFAULT, oldIsExtensionESet ) ); } /** @@ -276,8 +280,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__NAME, - oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -291,8 +296,9 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LN_CLASS__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LN_CLASS__NAME, oldName, NAME_EDEFAULT, + oldNameESet ) ); } /** @@ -338,14 +344,17 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { if( EcoreUtil.isAncestor( this, newLNClasses ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newLNClasses != null ) msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, - NsdPackage.LN_CLASSES__LN_CLASS, LNClasses.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newLNClasses != null ) + msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, NsdPackage.LN_CLASSES__LN_CLASS, + LNClasses.class, msgs ); msgs = basicSetLNClasses( newLNClasses, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LN_CLASS__LN_CLASSES, newLNClasses, newLNClasses ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LN_CLASS__LN_CLASSES, newLNClasses, + newLNClasses ) ); } /** @@ -357,7 +366,8 @@ public class LNClassImpl extends AnyLNClassImpl implements LNClass { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.LN_CLASS__LN_CLASSES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetLNClasses( ( LNClasses ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java index d321bc334cb83d3619f807d422ad4568839a8b1f..c524fffe1cfd6c14c0e827570c46f365fa65d3f8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LNClassesImpl.java @@ -196,7 +196,8 @@ public class LNClassesImpl extends NsdObjectImpl implements LNClasses { if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__LN_CLASSES, NS.class, msgs ); msgs = basicSetNS( newNS, msgs ); @@ -222,7 +223,8 @@ public class LNClassesImpl extends NsdObjectImpl implements LNClasses { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLNClass() ).basicAdd( otherEnd, msgs ); case NsdPackage.LN_CLASSES__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java index 838ebf815fc5951391a11a5aba58c20a3a513c6c..b8c543df70a77ae56ec7f564c01883f5defd3138 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LicenseImpl.java @@ -174,8 +174,9 @@ public class LicenseImpl extends NsdObjectImpl implements License { kind = newKind == null ? KIND_EDEFAULT : newKind; boolean oldKindESet = kindESet; kindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__KIND, - oldKind, kind, !oldKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__KIND, oldKind, kind, + !oldKindESet ) ); } /** @@ -189,8 +190,9 @@ public class LicenseImpl extends NsdObjectImpl implements License { boolean oldKindESet = kindESet; kind = KIND_EDEFAULT; kindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LICENSE__KIND, oldKind, KIND_EDEFAULT, oldKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LICENSE__KIND, oldKind, KIND_EDEFAULT, + oldKindESet ) ); } /** @@ -224,8 +226,9 @@ public class LicenseImpl extends NsdObjectImpl implements License { uri = newUri; boolean oldUriESet = uriESet; uriESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__URI, oldUri, uri, !oldUriESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__URI, oldUri, uri, + !oldUriESet ) ); } /** @@ -239,8 +242,9 @@ public class LicenseImpl extends NsdObjectImpl implements License { boolean oldUriESet = uriESet; uri = URI_EDEFAULT; uriESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LICENSE__URI, - oldUri, URI_EDEFAULT, oldUriESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LICENSE__URI, oldUri, URI_EDEFAULT, + oldUriESet ) ); } /** @@ -286,14 +290,17 @@ public class LicenseImpl extends NsdObjectImpl implements License { if( EcoreUtil.isAncestor( this, newCopyrightNotice ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCopyrightNotice != null ) msgs = ( ( InternalEObject ) newCopyrightNotice ).eInverseAdd( this, - NsdPackage.COPYRIGHT_NOTICE__LICENSE, CopyrightNotice.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCopyrightNotice != null ) + msgs = ( ( InternalEObject ) newCopyrightNotice ).eInverseAdd( this, + NsdPackage.COPYRIGHT_NOTICE__LICENSE, CopyrightNotice.class, msgs ); msgs = basicSetCopyrightNotice( newCopyrightNotice, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LICENSE__COPYRIGHT_NOTICE, newCopyrightNotice, newCopyrightNotice ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LICENSE__COPYRIGHT_NOTICE, + newCopyrightNotice, newCopyrightNotice ) ); } /** @@ -305,7 +312,8 @@ public class LicenseImpl extends NsdObjectImpl implements License { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.LICENSE__COPYRIGHT_NOTICE: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCopyrightNotice( ( CopyrightNotice ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java index e25243110ee28e537af1c13d32f74b74ea61d35a..cbd0e985441b55df0970f8ce4b7702e04775e5cb 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/LiteralImpl.java @@ -146,8 +146,9 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { literalVal = newLiteralVal; boolean oldLiteralValESet = literalValESet; literalValESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, literalVal, !oldLiteralValESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, + literalVal, !oldLiteralValESet ) ); } /** @@ -161,8 +162,9 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { boolean oldLiteralValESet = literalValESet; literalVal = LITERAL_VAL_EDEFAULT; literalValESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, LITERAL_VAL_EDEFAULT, oldLiteralValESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LITERAL__LITERAL_VAL, oldLiteralVal, + LITERAL_VAL_EDEFAULT, oldLiteralValESet ) ); } /** @@ -196,8 +198,9 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LITERAL__NAME, - oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LITERAL__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -211,8 +214,9 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.LITERAL__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.LITERAL__NAME, oldName, NAME_EDEFAULT, + oldNameESet ) ); } /** @@ -258,14 +262,17 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { if( EcoreUtil.isAncestor( this, newEnumeration ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newEnumeration != null ) msgs = ( ( InternalEObject ) newEnumeration ).eInverseAdd( this, - NsdPackage.ENUMERATION__LITERAL, Enumeration.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newEnumeration != null ) + msgs = ( ( InternalEObject ) newEnumeration ).eInverseAdd( this, NsdPackage.ENUMERATION__LITERAL, + Enumeration.class, msgs ); msgs = basicSetEnumeration( newEnumeration, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.LITERAL__ENUMERATION, newEnumeration, newEnumeration ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.LITERAL__ENUMERATION, newEnumeration, + newEnumeration ) ); } /** @@ -277,7 +284,8 @@ public class LiteralImpl extends DocumentedClassImpl implements Literal { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.LITERAL__ENUMERATION: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetEnumeration( ( Enumeration ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java index 4dc1d7826b70a020322fb4b199823c42aec742a0..55807ac5cc2c417f662358022cdc1850404c46a4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSDocImpl.java @@ -395,8 +395,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__ID, - oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__ID, oldId, ID_EDEFAULT, + oldIdESet ) ); } /** @@ -430,8 +431,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { lang = newLang; boolean oldLangESet = langESet; langESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__LANG, oldLang, lang, !oldLangESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__LANG, oldLang, lang, + !oldLangESet ) ); } /** @@ -445,8 +447,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldLangESet = langESet; lang = LANG_EDEFAULT; langESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__LANG, - oldLang, LANG_EDEFAULT, oldLangESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__LANG, oldLang, LANG_EDEFAULT, + oldLangESet ) ); } /** @@ -532,8 +535,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS_DOC__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__RELEASE, oldRelease, release, + !oldReleaseESet ) ); } /** @@ -547,8 +551,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS_DOC__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -582,8 +587,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS_DOC__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__REVISION, oldRevision, revision, + !oldRevisionESet ) ); } /** @@ -597,8 +603,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS_DOC__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -632,8 +639,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { umlDate = newUmlDate; boolean oldUmlDateESet = umlDateESet; umlDateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS_DOC__UML_DATE, oldUmlDate, umlDate, !oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__UML_DATE, oldUmlDate, umlDate, + !oldUmlDateESet ) ); } /** @@ -647,8 +655,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldUmlDateESet = umlDateESet; umlDate = UML_DATE_EDEFAULT; umlDateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS_DOC__UML_DATE, oldUmlDate, UML_DATE_EDEFAULT, oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__UML_DATE, oldUmlDate, + UML_DATE_EDEFAULT, oldUmlDateESet ) ); } /** @@ -682,8 +691,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { umlVersion = newUmlVersion; boolean oldUmlVersionESet = umlVersionESet; umlVersionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS_DOC__UML_VERSION, oldUmlVersion, umlVersion, !oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__UML_VERSION, oldUmlVersion, + umlVersion, !oldUmlVersionESet ) ); } /** @@ -697,8 +707,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldUmlVersionESet = umlVersionESet; umlVersion = UML_VERSION_EDEFAULT; umlVersionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS_DOC__UML_VERSION, oldUmlVersion, UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__UML_VERSION, oldUmlVersion, + UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); } /** @@ -747,8 +758,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS_DOC__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS_DOC__VERSION, oldVersion, version, + !oldVersionESet ) ); } /** @@ -762,8 +774,9 @@ public class NSDocImpl extends CopyrightedImpl implements NSDoc { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS_DOC__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS_DOC__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java index e093996635758ded21f4e963474720d19b2077a3..29bea81a4b4d01c4d56791147e1b4f72d8913de9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java @@ -579,18 +579,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setChanges( Changes newChanges ) { if( newChanges != changes ) { NotificationChain msgs = null; - if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, NsdPackage.CHANGES__NS, - Changes.class, msgs ); - if( newChanges != null ) msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this, - NsdPackage.CHANGES__NS, Changes.class, msgs ); + if( changes != null ) + msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, NsdPackage.CHANGES__NS, Changes.class, + msgs ); + if( newChanges != null ) + msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this, NsdPackage.CHANGES__NS, Changes.class, + msgs ); msgs = basicSetChanges( newChanges, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldChangesESet = changesESet; changesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__CHANGES, newChanges, newChanges, !oldChangesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CHANGES, newChanges, newChanges, + !oldChangesESet ) ); } } @@ -631,8 +634,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldChangesESet = changesESet; changesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__CHANGES, null, null, oldChangesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__CHANGES, null, null, + oldChangesESet ) ); } } @@ -686,18 +690,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setDependsOn( DependsOn newDependsOn ) { if( newDependsOn != dependsOn ) { NotificationChain msgs = null; - if( dependsOn != null ) msgs = ( ( InternalEObject ) dependsOn ).eInverseRemove( this, - NsdPackage.DEPENDS_ON__NS, DependsOn.class, msgs ); - if( newDependsOn != null ) msgs = ( ( InternalEObject ) newDependsOn ).eInverseAdd( this, - NsdPackage.DEPENDS_ON__NS, DependsOn.class, msgs ); + if( dependsOn != null ) + msgs = ( ( InternalEObject ) dependsOn ).eInverseRemove( this, NsdPackage.DEPENDS_ON__NS, + DependsOn.class, msgs ); + if( newDependsOn != null ) + msgs = ( ( InternalEObject ) newDependsOn ).eInverseAdd( this, NsdPackage.DEPENDS_ON__NS, + DependsOn.class, msgs ); msgs = basicSetDependsOn( newDependsOn, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldDependsOnESet = dependsOnESet; dependsOnESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__DEPENDS_ON, newDependsOn, newDependsOn, !oldDependsOnESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__DEPENDS_ON, newDependsOn, + newDependsOn, !oldDependsOnESet ) ); } } @@ -739,8 +746,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldDependsOnESet = dependsOnESet; dependsOnESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__DEPENDS_ON, null, null, oldDependsOnESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__DEPENDS_ON, null, null, + oldDependsOnESet ) ); } } @@ -794,18 +802,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setBasicTypes( BasicTypes newBasicTypes ) { if( newBasicTypes != basicTypes ) { NotificationChain msgs = null; - if( basicTypes != null ) msgs = ( ( InternalEObject ) basicTypes ).eInverseRemove( this, - NsdPackage.BASIC_TYPES__NS, BasicTypes.class, msgs ); - if( newBasicTypes != null ) msgs = ( ( InternalEObject ) newBasicTypes ).eInverseAdd( this, - NsdPackage.BASIC_TYPES__NS, BasicTypes.class, msgs ); + if( basicTypes != null ) + msgs = ( ( InternalEObject ) basicTypes ).eInverseRemove( this, NsdPackage.BASIC_TYPES__NS, + BasicTypes.class, msgs ); + if( newBasicTypes != null ) + msgs = ( ( InternalEObject ) newBasicTypes ).eInverseAdd( this, NsdPackage.BASIC_TYPES__NS, + BasicTypes.class, msgs ); msgs = basicSetBasicTypes( newBasicTypes, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldBasicTypesESet = basicTypesESet; basicTypesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__BASIC_TYPES, newBasicTypes, newBasicTypes, !oldBasicTypesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__BASIC_TYPES, newBasicTypes, + newBasicTypes, !oldBasicTypesESet ) ); } } @@ -847,8 +858,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldBasicTypesESet = basicTypesESet; basicTypesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__BASIC_TYPES, null, null, oldBasicTypesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__BASIC_TYPES, null, null, + oldBasicTypesESet ) ); } } @@ -904,10 +916,12 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setFunctionalConstraints( FunctionalConstraints newFunctionalConstraints ) { if( newFunctionalConstraints != functionalConstraints ) { NotificationChain msgs = null; - if( functionalConstraints != null ) msgs = ( ( InternalEObject ) functionalConstraints ) - .eInverseRemove( this, NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, FunctionalConstraints.class, msgs ); - if( newFunctionalConstraints != null ) msgs = ( ( InternalEObject ) newFunctionalConstraints ) - .eInverseAdd( this, NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, FunctionalConstraints.class, msgs ); + if( functionalConstraints != null ) + msgs = ( ( InternalEObject ) functionalConstraints ).eInverseRemove( this, + NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, FunctionalConstraints.class, msgs ); + if( newFunctionalConstraints != null ) + msgs = ( ( InternalEObject ) newFunctionalConstraints ).eInverseAdd( this, + NsdPackage.FUNCTIONAL_CONSTRAINTS__NS, FunctionalConstraints.class, msgs ); msgs = basicSetFunctionalConstraints( newFunctionalConstraints, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -959,8 +973,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldFunctionalConstraintsESet = functionalConstraintsESet; functionalConstraintsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, null, oldFunctionalConstraintsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, + null, oldFunctionalConstraintsESet ) ); } } @@ -1016,10 +1031,12 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setPresenceConditions( PresenceConditions newPresenceConditions ) { if( newPresenceConditions != presenceConditions ) { NotificationChain msgs = null; - if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, - NsdPackage.PRESENCE_CONDITIONS__NS, PresenceConditions.class, msgs ); - if( newPresenceConditions != null ) msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, - NsdPackage.PRESENCE_CONDITIONS__NS, PresenceConditions.class, msgs ); + if( presenceConditions != null ) + msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, + NsdPackage.PRESENCE_CONDITIONS__NS, PresenceConditions.class, msgs ); + if( newPresenceConditions != null ) + msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, + NsdPackage.PRESENCE_CONDITIONS__NS, PresenceConditions.class, msgs ); msgs = basicSetPresenceConditions( newPresenceConditions, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -1070,8 +1087,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldPresenceConditionsESet = presenceConditionsESet; presenceConditionsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__PRESENCE_CONDITIONS, null, null, oldPresenceConditionsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__PRESENCE_CONDITIONS, null, + null, oldPresenceConditionsESet ) ); } } @@ -1125,18 +1143,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setAbbreviations( Abbreviations newAbbreviations ) { if( newAbbreviations != abbreviations ) { NotificationChain msgs = null; - if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, - NsdPackage.ABBREVIATIONS__NS, Abbreviations.class, msgs ); - if( newAbbreviations != null ) msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, - NsdPackage.ABBREVIATIONS__NS, Abbreviations.class, msgs ); + if( abbreviations != null ) + msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, NsdPackage.ABBREVIATIONS__NS, + Abbreviations.class, msgs ); + if( newAbbreviations != null ) + msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, NsdPackage.ABBREVIATIONS__NS, + Abbreviations.class, msgs ); msgs = basicSetAbbreviations( newAbbreviations, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldAbbreviationsESet = abbreviationsESet; abbreviationsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__ABBREVIATIONS, newAbbreviations, newAbbreviations, !oldAbbreviationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__ABBREVIATIONS, newAbbreviations, + newAbbreviations, !oldAbbreviationsESet ) ); } } @@ -1178,8 +1199,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldAbbreviationsESet = abbreviationsESet; abbreviationsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__ABBREVIATIONS, null, null, oldAbbreviationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__ABBREVIATIONS, null, null, + oldAbbreviationsESet ) ); } } @@ -1233,18 +1255,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setEnumerations( Enumerations newEnumerations ) { if( newEnumerations != enumerations ) { NotificationChain msgs = null; - if( enumerations != null ) msgs = ( ( InternalEObject ) enumerations ).eInverseRemove( this, - NsdPackage.ENUMERATIONS__NS, Enumerations.class, msgs ); - if( newEnumerations != null ) msgs = ( ( InternalEObject ) newEnumerations ).eInverseAdd( this, - NsdPackage.ENUMERATIONS__NS, Enumerations.class, msgs ); + if( enumerations != null ) + msgs = ( ( InternalEObject ) enumerations ).eInverseRemove( this, NsdPackage.ENUMERATIONS__NS, + Enumerations.class, msgs ); + if( newEnumerations != null ) + msgs = ( ( InternalEObject ) newEnumerations ).eInverseAdd( this, NsdPackage.ENUMERATIONS__NS, + Enumerations.class, msgs ); msgs = basicSetEnumerations( newEnumerations, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldEnumerationsESet = enumerationsESet; enumerationsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__ENUMERATIONS, newEnumerations, newEnumerations, !oldEnumerationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__ENUMERATIONS, newEnumerations, + newEnumerations, !oldEnumerationsESet ) ); } } @@ -1286,8 +1311,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldEnumerationsESet = enumerationsESet; enumerationsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__ENUMERATIONS, null, null, oldEnumerationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__ENUMERATIONS, null, null, + oldEnumerationsESet ) ); } } @@ -1343,10 +1369,12 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setConstructedAttributes( ConstructedAttributes newConstructedAttributes ) { if( newConstructedAttributes != constructedAttributes ) { NotificationChain msgs = null; - if( constructedAttributes != null ) msgs = ( ( InternalEObject ) constructedAttributes ) - .eInverseRemove( this, NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, ConstructedAttributes.class, msgs ); - if( newConstructedAttributes != null ) msgs = ( ( InternalEObject ) newConstructedAttributes ) - .eInverseAdd( this, NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, ConstructedAttributes.class, msgs ); + if( constructedAttributes != null ) + msgs = ( ( InternalEObject ) constructedAttributes ).eInverseRemove( this, + NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, ConstructedAttributes.class, msgs ); + if( newConstructedAttributes != null ) + msgs = ( ( InternalEObject ) newConstructedAttributes ).eInverseAdd( this, + NsdPackage.CONSTRUCTED_ATTRIBUTES__NS, ConstructedAttributes.class, msgs ); msgs = basicSetConstructedAttributes( newConstructedAttributes, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -1398,8 +1426,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldConstructedAttributesESet = constructedAttributesESet; constructedAttributesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, null, oldConstructedAttributesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, + null, oldConstructedAttributesESet ) ); } } @@ -1463,8 +1492,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldCDCsESet = cDCsESet; cDCsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CD_CS, - newCDCs, newCDCs, !oldCDCsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__CD_CS, newCDCs, newCDCs, + !oldCDCsESet ) ); } } @@ -1505,8 +1535,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldCDCsESet = cDCsESet; cDCsESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__CD_CS, null, null, oldCDCsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__CD_CS, null, null, + oldCDCsESet ) ); } } @@ -1560,18 +1591,21 @@ public class NSImpl extends CopyrightedImpl implements NS { public void setLNClasses( LNClasses newLNClasses ) { if( newLNClasses != lNClasses ) { NotificationChain msgs = null; - if( lNClasses != null ) msgs = ( ( InternalEObject ) lNClasses ).eInverseRemove( this, - NsdPackage.LN_CLASSES__NS, LNClasses.class, msgs ); - if( newLNClasses != null ) msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, - NsdPackage.LN_CLASSES__NS, LNClasses.class, msgs ); + if( lNClasses != null ) + msgs = ( ( InternalEObject ) lNClasses ).eInverseRemove( this, NsdPackage.LN_CLASSES__NS, + LNClasses.class, msgs ); + if( newLNClasses != null ) + msgs = ( ( InternalEObject ) newLNClasses ).eInverseAdd( this, NsdPackage.LN_CLASSES__NS, + LNClasses.class, msgs ); msgs = basicSetLNClasses( newLNClasses, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldLNClassesESet = lNClassesESet; lNClassesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__LN_CLASSES, newLNClasses, newLNClasses, !oldLNClassesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__LN_CLASSES, newLNClasses, + newLNClasses, !oldLNClassesESet ) ); } } @@ -1613,8 +1647,9 @@ public class NSImpl extends CopyrightedImpl implements NS { else { boolean oldLNClassesESet = lNClassesESet; lNClassesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__LN_CLASSES, null, null, oldLNClassesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__LN_CLASSES, null, null, + oldLNClassesESet ) ); } } @@ -1677,7 +1712,7 @@ public class NSImpl extends CopyrightedImpl implements NS { // Look for in NS referred by DependsOn // Warning: NS referred by DependsOn may not be loaded - if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) { + if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() ) ) { getDependsOn().buildExplicitLinks( console ); return getDependsOn().getRefersToNS().findCDC( cDCName, console ); } @@ -1700,7 +1735,7 @@ public class NSImpl extends CopyrightedImpl implements NS { // Look for in NS referred by DependsOn // Warning: NS referred by DependsOn may not be loaded - if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) { + if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() ) ) { getDependsOn().buildExplicitLinks( console ); return getDependsOn().getRefersToNS().findPresenceCondition( presenceConditionName, console ); } @@ -1725,7 +1760,7 @@ public class NSImpl extends CopyrightedImpl implements NS { // Look for in NS referred by DependsOn // Warning: NS referred by DependsOn may not be loaded - if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) { + if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() ) ) { getDependsOn().buildExplicitLinks( console ); return getDependsOn().getRefersToNS().findFunctionalConstraint( functionalConstraintAbbreviation, console ); } @@ -1748,7 +1783,7 @@ public class NSImpl extends CopyrightedImpl implements NS { // Look for in NS referred by DependsOn // Warning: NS referred by DependsOn may not be loaded - if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) { + if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() ) ) { getDependsOn().buildExplicitLinks( console ); return getDependsOn().getRefersToNS().findEnumeration( enumerationName, console ); } @@ -1771,7 +1806,7 @@ public class NSImpl extends CopyrightedImpl implements NS { // Look for in NS referred by DependsOn // Warning: NS referred by DependsOn may not be loaded - if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) { + if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() ) ) { getDependsOn().buildExplicitLinks( console ); return getDependsOn().getRefersToNS().findBasicType( basicTypeName, console ); } @@ -1800,8 +1835,9 @@ public class NSImpl extends CopyrightedImpl implements NS { descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__DESC_ID, - oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__DESC_ID, oldDescID, descID, + !oldDescIDESet ) ); } /** @@ -1815,8 +1851,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__DESC_ID, - oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -1865,8 +1902,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__ID, oldId, ID_EDEFAULT, + oldIdESet ) ); } /** @@ -1900,8 +1938,9 @@ public class NSImpl extends CopyrightedImpl implements NS { publicationStage = newPublicationStage == null ? PUBLICATION_STAGE_EDEFAULT : newPublicationStage; boolean oldPublicationStageESet = publicationStageESet; publicationStageESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__PUBLICATION_STAGE, oldPublicationStage, publicationStage, !oldPublicationStageESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__PUBLICATION_STAGE, + oldPublicationStage, publicationStage, !oldPublicationStageESet ) ); } /** @@ -1951,8 +1990,9 @@ public class NSImpl extends CopyrightedImpl implements NS { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__RELEASE, - oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__RELEASE, oldRelease, release, + !oldReleaseESet ) ); } /** @@ -1966,8 +2006,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__RELEASE, - oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -2001,8 +2042,9 @@ public class NSImpl extends CopyrightedImpl implements NS { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__REVISION, - oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__REVISION, oldRevision, revision, + !oldRevisionESet ) ); } /** @@ -2016,8 +2058,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__REVISION, - oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -2051,8 +2094,9 @@ public class NSImpl extends CopyrightedImpl implements NS { umlDate = newUmlDate; boolean oldUmlDateESet = umlDateESet; umlDateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__UML_DATE, - oldUmlDate, umlDate, !oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__UML_DATE, oldUmlDate, umlDate, + !oldUmlDateESet ) ); } /** @@ -2066,8 +2110,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldUmlDateESet = umlDateESet; umlDate = UML_DATE_EDEFAULT; umlDateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__UML_DATE, - oldUmlDate, UML_DATE_EDEFAULT, oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__UML_DATE, oldUmlDate, + UML_DATE_EDEFAULT, oldUmlDateESet ) ); } /** @@ -2101,8 +2146,9 @@ public class NSImpl extends CopyrightedImpl implements NS { umlVersion = newUmlVersion; boolean oldUmlVersionESet = umlVersionESet; umlVersionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NS__UML_VERSION, oldUmlVersion, umlVersion, !oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__UML_VERSION, oldUmlVersion, + umlVersion, !oldUmlVersionESet ) ); } /** @@ -2116,8 +2162,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldUmlVersionESet = umlVersionESet; umlVersion = UML_VERSION_EDEFAULT; umlVersionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.NS__UML_VERSION, oldUmlVersion, UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__UML_VERSION, oldUmlVersion, + UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); } /** @@ -2140,44 +2187,54 @@ public class NSImpl extends CopyrightedImpl implements NS { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.NS__CHANGES: - if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CHANGES, null, msgs ); + if( changes != null ) + msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CHANGES, null, msgs ); return basicSetChanges( ( Changes ) otherEnd, msgs ); case NsdPackage.NS__DEPENDS_ON: - if( dependsOn != null ) msgs = ( ( InternalEObject ) dependsOn ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__DEPENDS_ON, null, msgs ); + if( dependsOn != null ) + msgs = ( ( InternalEObject ) dependsOn ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__DEPENDS_ON, null, msgs ); return basicSetDependsOn( ( DependsOn ) otherEnd, msgs ); case NsdPackage.NS__BASIC_TYPES: - if( basicTypes != null ) msgs = ( ( InternalEObject ) basicTypes ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__BASIC_TYPES, null, msgs ); + if( basicTypes != null ) + msgs = ( ( InternalEObject ) basicTypes ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__BASIC_TYPES, null, msgs ); return basicSetBasicTypes( ( BasicTypes ) otherEnd, msgs ); case NsdPackage.NS__FUNCTIONAL_CONSTRAINTS: - if( functionalConstraints != null ) msgs = ( ( InternalEObject ) functionalConstraints ) - .eInverseRemove( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, msgs ); + if( functionalConstraints != null ) + msgs = ( ( InternalEObject ) functionalConstraints ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__FUNCTIONAL_CONSTRAINTS, null, msgs ); return basicSetFunctionalConstraints( ( FunctionalConstraints ) otherEnd, msgs ); case NsdPackage.NS__PRESENCE_CONDITIONS: - if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__PRESENCE_CONDITIONS, null, msgs ); + if( presenceConditions != null ) + msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__PRESENCE_CONDITIONS, null, msgs ); return basicSetPresenceConditions( ( PresenceConditions ) otherEnd, msgs ); case NsdPackage.NS__ABBREVIATIONS: - if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ABBREVIATIONS, null, msgs ); + if( abbreviations != null ) + msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ABBREVIATIONS, null, msgs ); return basicSetAbbreviations( ( Abbreviations ) otherEnd, msgs ); case NsdPackage.NS__ENUMERATIONS: - if( enumerations != null ) msgs = ( ( InternalEObject ) enumerations ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ENUMERATIONS, null, msgs ); + if( enumerations != null ) + msgs = ( ( InternalEObject ) enumerations ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__ENUMERATIONS, null, msgs ); return basicSetEnumerations( ( Enumerations ) otherEnd, msgs ); case NsdPackage.NS__CONSTRUCTED_ATTRIBUTES: - if( constructedAttributes != null ) msgs = ( ( InternalEObject ) constructedAttributes ) - .eInverseRemove( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, msgs ); + if( constructedAttributes != null ) + msgs = ( ( InternalEObject ) constructedAttributes ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CONSTRUCTED_ATTRIBUTES, null, msgs ); return basicSetConstructedAttributes( ( ConstructedAttributes ) otherEnd, msgs ); case NsdPackage.NS__CD_CS: - if( cDCs != null ) msgs = ( ( InternalEObject ) cDCs ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CD_CS, null, msgs ); + if( cDCs != null ) + msgs = ( ( InternalEObject ) cDCs ).eInverseRemove( this, EOPPOSITE_FEATURE_BASE - NsdPackage.NS__CD_CS, + null, msgs ); return basicSetCDCs( ( CDCs ) otherEnd, msgs ); case NsdPackage.NS__LN_CLASSES: - if( lNClasses != null ) msgs = ( ( InternalEObject ) lNClasses ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.NS__LN_CLASSES, null, msgs ); + if( lNClasses != null ) + msgs = ( ( InternalEObject ) lNClasses ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.NS__LN_CLASSES, null, msgs ); return basicSetLNClasses( ( LNClasses ) otherEnd, msgs ); case NsdPackage.NS__REFERRED_BY_DEPENDS_ON: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDependsOn() ) @@ -2207,8 +2264,9 @@ public class NSImpl extends CopyrightedImpl implements NS { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__VERSION, - oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NS__VERSION, oldVersion, version, + !oldVersionESet ) ); } /** @@ -2222,8 +2280,9 @@ public class NSImpl extends CopyrightedImpl implements NS { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__VERSION, - oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.NS__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java index 60ffdcb8d14ee27b35c6ac15a888900aa3d618a5..893aebd7a34df5d7425b255c6454268e61787d3b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NoticeImpl.java @@ -125,14 +125,17 @@ public class NoticeImpl extends NsdObjectImpl implements Notice { if( EcoreUtil.isAncestor( this, newCopyrightNotice ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCopyrightNotice != null ) msgs = ( ( InternalEObject ) newCopyrightNotice ).eInverseAdd( this, - NsdPackage.COPYRIGHT_NOTICE__NOTICE, CopyrightNotice.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCopyrightNotice != null ) + msgs = ( ( InternalEObject ) newCopyrightNotice ).eInverseAdd( this, + NsdPackage.COPYRIGHT_NOTICE__NOTICE, CopyrightNotice.class, msgs ); msgs = basicSetCopyrightNotice( newCopyrightNotice, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NOTICE__COPYRIGHT_NOTICE, newCopyrightNotice, newCopyrightNotice ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NOTICE__COPYRIGHT_NOTICE, + newCopyrightNotice, newCopyrightNotice ) ); } /** @@ -144,7 +147,8 @@ public class NoticeImpl extends NsdObjectImpl implements Notice { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.NOTICE__COPYRIGHT_NOTICE: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCopyrightNotice( ( CopyrightNotice ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdObjectImpl.java index 5e5b949d2fcb212925014fa9df4af167931b2bfb..02ff86347a0ecc26b90c63b6437fe843d57136ce 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdObjectImpl.java @@ -123,8 +123,9 @@ public abstract class NsdObjectImpl extends MinimalEObjectImpl.Container impleme public void setLineNumber( int newLineNumber ) { int oldLineNumber = lineNumber; lineNumber = newLineNumber; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NSD_OBJECT__LINE_NUMBER, oldLineNumber, lineNumber ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NSD_OBJECT__LINE_NUMBER, oldLineNumber, + lineNumber ) ); } /** @@ -146,8 +147,9 @@ public abstract class NsdObjectImpl extends MinimalEObjectImpl.Container impleme public void setExplicitLinksBuilt( boolean newExplicitLinksBuilt ) { boolean oldExplicitLinksBuilt = explicitLinksBuilt; explicitLinksBuilt = newExplicitLinksBuilt; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.NSD_OBJECT__EXPLICIT_LINKS_BUILT, oldExplicitLinksBuilt, explicitLinksBuilt ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.NSD_OBJECT__EXPLICIT_LINKS_BUILT, + oldExplicitLinksBuilt, explicitLinksBuilt ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java index e4c05abbe055803d639e23f589cfb4778373105e..fde012821db48ab938a9cdaecb4cd9da587e89ac 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NsdPackageImpl.java @@ -688,12 +688,13 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage { theNsdPackage.initializePackageContents(); // Register package validator - EValidator.Registry.INSTANCE.put( theNsdPackage, new EValidator.Descriptor() { - @Override - public EValidator getEValidator() { - return NsdValidator.INSTANCE; - } - } ); + EValidator.Registry.INSTANCE.put( theNsdPackage, + new EValidator.Descriptor() { + @Override + public EValidator getEValidator() { + return NsdValidator.INSTANCE; + } + } ); // Mark meta-data to indicate it can't be changed theNsdPackage.freeze(); @@ -5282,8 +5283,12 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage { */ protected void createImportAnnotations() { String source = "http://www.eclipse.org/OCL/Import"; - addAnnotation( this, source, new String[] { "ecore", "http://www.eclipse.org/emf/2002/Ecore", "ecore.xml.type", - "http://www.eclipse.org/emf/2003/XMLType" } ); + addAnnotation( this, + source, + new String[] { + "ecore", "http://www.eclipse.org/emf/2002/Ecore", + "ecore.xml.type", "http://www.eclipse.org/emf/2003/XMLType" + } ); } /** @@ -5294,57 +5299,183 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage { */ protected void createEcoreAnnotations() { String source = "http://www.eclipse.org/emf/2002/Ecore"; - addAnnotation( this, source, - new String[] { "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", - "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "validationDelegates", - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" } ); - addAnnotation( serviceTypeEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( abbreviationEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( abbreviationsEClass, source, new String[] { "constraints", "uniqueAbbreviation" } ); - addAnnotation( abstractLNClassEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( anyLNClassEClass, source, new String[] { "constraints", "uniqueDataObject" } ); - addAnnotation( applicableServiceNSEClass, source, - new String[] { "constraints", "versionAttributeRequired dateAttributeRequired" } ); - addAnnotation( applicableServicesEClass, source, - new String[] { "constraints", "uniqueDataSetMemberOf uniqueService" } ); - addAnnotation( basicTypeEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( cdcEClass, source, new String[] { "constraints", "uniqueCDCChild nameAttributeRequired" } ); - addAnnotation( cdCsEClass, source, new String[] { "constraints", "uniqueCDC" } ); - addAnnotation( changesEClass, source, new String[] { "constraints", "versionAttributeRequired" } ); - addAnnotation( constructedAttributeEClass, source, - new String[] { "constraints", "uniqueSubDataAttribute nameAttributeRequired" } ); - addAnnotation( constructedAttributesEClass, source, - new String[] { "constraints", "uniqueConstructedAttribute" } ); - addAnnotation( dataAttributeEClass, source, - new String[] { "constraints", "nameAttributeRequired fcAttributeRequired" } ); - addAnnotation( dataObjectEClass, source, - new String[] { "constraints", "nameAttributeRequired typeAttributeRequired" } ); - addAnnotation( dataSetMemberOfEClass, source, new String[] { "constraints", "cbAttributeRequired" } ); - addAnnotation( docEClass, source, new String[] { "constraints", "idAttributeRequired" } ); - addAnnotation( enumerationEClass, source, - new String[] { "constraints", "uniqueLiteralName uniqueLiteralVal nameAttributeRequired" } ); - addAnnotation( enumerationsEClass, source, new String[] { "constraints", "uniqueEnumeration" } ); - addAnnotation( functionalConstraintEClass, source, - new String[] { "constraints", "abbreviationAttributeRequired" } ); - addAnnotation( functionalConstraintsEClass, source, - new String[] { "constraints", "uniqueFunctionalConstraint" } ); - addAnnotation( literalEClass, source, - new String[] { "constraints", "nameAttributeRequired literalValAttributeRequired" } ); - addAnnotation( lnClassEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( lnClassesEClass, source, new String[] { "constraints", "uniqueAbstractLNClass uniqueLNClass" } ); - addAnnotation( nsDocEClass, source, new String[] { "constraints", "langAttributeRequired" } ); - addAnnotation( presenceConditionEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( presenceConditionsEClass, source, new String[] { "constraints", "uniquePresenceCondition" } ); - addAnnotation( serviceCDCEClass, source, new String[] { "constraints", "cdcAttributeRequired" } ); - addAnnotation( serviceDataAttributeEClass, source, - new String[] { "constraints", "nameAttributeRequired fcAttributeRequired" } ); - addAnnotation( serviceParameterEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( subDataAttributeEClass, source, new String[] { "constraints", "nameAttributeRequired" } ); - addAnnotation( subDataObjectEClass, source, - new String[] { "constraints", "nameAttributeRequired typeAttributeRequired" } ); - addAnnotation( titledClassEClass, source, new String[] { "constraints", "titleIDAttributeRequired" } ); - addAnnotation( agNSIdentificationEClass, source, - new String[] { "constraints", "idAttributeRequired versionAttributeRequired" } ); + addAnnotation( this, + source, + new String[] { + "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" + } ); + addAnnotation( serviceTypeEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( abbreviationEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( abbreviationsEClass, + source, + new String[] { + "constraints", "uniqueAbbreviation" + } ); + addAnnotation( abstractLNClassEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( anyLNClassEClass, + source, + new String[] { + "constraints", "uniqueDataObject" + } ); + addAnnotation( applicableServiceNSEClass, + source, + new String[] { + "constraints", "versionAttributeRequired dateAttributeRequired" + } ); + addAnnotation( applicableServicesEClass, + source, + new String[] { + "constraints", "uniqueDataSetMemberOf uniqueService" + } ); + addAnnotation( basicTypeEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( cdcEClass, + source, + new String[] { + "constraints", "uniqueCDCChild nameAttributeRequired" + } ); + addAnnotation( cdCsEClass, + source, + new String[] { + "constraints", "uniqueCDC" + } ); + addAnnotation( changesEClass, + source, + new String[] { + "constraints", "versionAttributeRequired" + } ); + addAnnotation( constructedAttributeEClass, + source, + new String[] { + "constraints", "uniqueSubDataAttribute nameAttributeRequired" + } ); + addAnnotation( constructedAttributesEClass, + source, + new String[] { + "constraints", "uniqueConstructedAttribute" + } ); + addAnnotation( dataAttributeEClass, + source, + new String[] { + "constraints", "nameAttributeRequired fcAttributeRequired" + } ); + addAnnotation( dataObjectEClass, + source, + new String[] { + "constraints", "nameAttributeRequired typeAttributeRequired" + } ); + addAnnotation( dataSetMemberOfEClass, + source, + new String[] { + "constraints", "cbAttributeRequired" + } ); + addAnnotation( docEClass, + source, + new String[] { + "constraints", "idAttributeRequired" + } ); + addAnnotation( enumerationEClass, + source, + new String[] { + "constraints", "uniqueLiteralName uniqueLiteralVal nameAttributeRequired" + } ); + addAnnotation( enumerationsEClass, + source, + new String[] { + "constraints", "uniqueEnumeration" + } ); + addAnnotation( functionalConstraintEClass, + source, + new String[] { + "constraints", "abbreviationAttributeRequired" + } ); + addAnnotation( functionalConstraintsEClass, + source, + new String[] { + "constraints", "uniqueFunctionalConstraint" + } ); + addAnnotation( literalEClass, + source, + new String[] { + "constraints", "nameAttributeRequired literalValAttributeRequired" + } ); + addAnnotation( lnClassEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( lnClassesEClass, + source, + new String[] { + "constraints", "uniqueAbstractLNClass uniqueLNClass" + } ); + addAnnotation( nsDocEClass, + source, + new String[] { + "constraints", "langAttributeRequired" + } ); + addAnnotation( presenceConditionEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( presenceConditionsEClass, + source, + new String[] { + "constraints", "uniquePresenceCondition" + } ); + addAnnotation( serviceCDCEClass, + source, + new String[] { + "constraints", "cdcAttributeRequired" + } ); + addAnnotation( serviceDataAttributeEClass, + source, + new String[] { + "constraints", "nameAttributeRequired fcAttributeRequired" + } ); + addAnnotation( serviceParameterEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( subDataAttributeEClass, + source, + new String[] { + "constraints", "nameAttributeRequired" + } ); + addAnnotation( subDataObjectEClass, + source, + new String[] { + "constraints", "nameAttributeRequired typeAttributeRequired" + } ); + addAnnotation( titledClassEClass, + source, + new String[] { + "constraints", "titleIDAttributeRequired" + } ); + addAnnotation( agNSIdentificationEClass, + source, + new String[] { + "constraints", "idAttributeRequired versionAttributeRequired" + } ); } /** @@ -5355,316 +5486,1282 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage { */ protected void createExtendedMetaDataAnnotations() { String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; - addAnnotation( appliesToTypeEClass, source, new String[] { "name", "AppliesTo_._type", "kind", "empty" } ); - addAnnotation( dependsOnEClass, source, new String[] { "name", "DependsOn_._type", "kind", "empty" } ); - addAnnotation( documentRootEClass, source, new String[] { "name", "", "kind", "mixed" } ); - addAnnotation( getDocumentRoot_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } ); - addAnnotation( getDocumentRoot_XMLNSPrefixMap(), source, - new String[] { "kind", "attribute", "name", "xmlns:prefix" } ); - addAnnotation( getDocumentRoot_XSISchemaLocation(), source, - new String[] { "kind", "attribute", "name", "xsi:schemaLocation" } ); - addAnnotation( getDocumentRoot_ApplicableServiceNS(), source, - new String[] { "kind", "element", "name", "ApplicableServiceNS", "namespace", "##targetNamespace" } ); - addAnnotation( getDocumentRoot_NS(), source, - new String[] { "kind", "element", "name", "NS", "namespace", "##targetNamespace" } ); - addAnnotation( getDocumentRoot_NSDoc(), source, - new String[] { "kind", "element", "name", "NSDoc", "namespace", "##targetNamespace" } ); - addAnnotation( getDocumentRoot_ServiceNS(), source, - new String[] { "kind", "element", "name", "ServiceNS", "namespace", "##targetNamespace" } ); - addAnnotation( serviceTypeEClass, source, new String[] { "name", "Service_._type", "kind", "empty" } ); - addAnnotation( getServiceType_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( abbreviationEClass, source, new String[] { "name", "tAbbreviation", "kind", "empty" } ); - addAnnotation( getAbbreviation_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } ); - addAnnotation( getAbbreviation_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( abbreviationsEClass, source, new String[] { "name", "tAbbreviations", "kind", "elementOnly" } ); - addAnnotation( getAbbreviations_Abbreviation(), source, - new String[] { "kind", "element", "name", "Abbreviation", "namespace", "##targetNamespace" } ); - addAnnotation( abstractLNClassEClass, source, - new String[] { "name", "tAbstractLNClass", "kind", "elementOnly" } ); - addAnnotation( getAbstractLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( acsiServicesKindEEnum, source, new String[] { "name", "tACSIServicesKind" } ); - addAnnotation( acsiServicesKindObjectEDataType, source, - new String[] { "name", "tACSIServicesKind:Object", "baseType", "tACSIServicesKind" } ); - addAnnotation( anyLNClassEClass, source, new String[] { "name", "tAnyLNClass", "kind", "elementOnly" } ); - addAnnotation( getAnyLNClass_DataObject(), source, - new String[] { "kind", "element", "name", "DataObject", "namespace", "##targetNamespace" } ); - addAnnotation( getAnyLNClass_Base(), source, new String[] { "kind", "attribute", "name", "base" } ); - addAnnotation( applicableServiceNSEClass, source, - new String[] { "name", "tApplicableServiceNS", "kind", "elementOnly" } ); - addAnnotation( getApplicableServiceNS_ServiceNsUsage(), source, - new String[] { "kind", "element", "name", "ServiceNsUsage", "namespace", "##targetNamespace" } ); - addAnnotation( getApplicableServiceNS_Date(), source, new String[] { "kind", "attribute", "name", "date" } ); - addAnnotation( getApplicableServiceNS_Version(), source, - new String[] { "kind", "attribute", "name", "version" } ); - addAnnotation( applicableServicesEClass, source, - new String[] { "name", "tApplicableServices", "kind", "elementOnly" } ); - addAnnotation( getApplicableServices_Service(), source, - new String[] { "kind", "element", "name", "Service", "namespace", "##targetNamespace" } ); - addAnnotation( getApplicableServices_DataSetMemberOf(), source, - new String[] { "kind", "element", "name", "DataSetMemberOf", "namespace", "##targetNamespace" } ); - addAnnotation( attributeTypeKindEDataType, source, new String[] { "name", "tAttributeTypeKind", "memberTypes", - "tDefinedAttributeTypeKind tUndefinedAttributeTypeKind" } ); - addAnnotation( basicTypeEClass, source, new String[] { "name", "tBasicType", "kind", "empty" } ); - addAnnotation( getBasicType_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } ); - addAnnotation( getBasicType_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( basicTypesEClass, source, new String[] { "name", "tBasicTypes", "kind", "elementOnly" } ); - addAnnotation( getBasicTypes_BasicType(), source, - new String[] { "kind", "element", "name", "BasicType", "namespace", "##targetNamespace" } ); - addAnnotation( cbKindEEnum, source, new String[] { "name", "tCBKind" } ); - addAnnotation( cbKindObjectEDataType, source, - new String[] { "name", "tCBKind:Object", "baseType", "tCBKind" } ); - addAnnotation( cdcEClass, source, new String[] { "name", "tCDC", "kind", "elementOnly" } ); - addAnnotation( getCDC_SubDataObject(), source, - new String[] { "kind", "element", "name", "SubDataObject", "namespace", "##targetNamespace" } ); - addAnnotation( getCDC_DataAttribute(), source, - new String[] { "kind", "element", "name", "DataAttribute", "namespace", "##targetNamespace" } ); - addAnnotation( getCDC_ServiceParameter(), source, - new String[] { "kind", "element", "name", "ServiceParameter", "namespace", "##targetNamespace" } ); - addAnnotation( getCDC_EnumParameterized(), source, - new String[] { "kind", "attribute", "name", "enumParameterized" } ); - addAnnotation( getCDC_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( getCDC_Statistics(), source, new String[] { "kind", "attribute", "name", "statistics" } ); - addAnnotation( getCDC_TypeKindParameterized(), source, - new String[] { "kind", "attribute", "name", "typeKindParameterized" } ); - addAnnotation( getCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } ); - addAnnotation( cdCsEClass, source, new String[] { "name", "tCDCs", "kind", "elementOnly" } ); - addAnnotation( getCDCs_CDC(), source, - new String[] { "kind", "element", "name", "CDC", "namespace", "##targetNamespace" } ); - addAnnotation( changesEClass, source, new String[] { "name", "tChanges", "kind", "empty" } ); - addAnnotation( getChanges_ChangesID(), source, new String[] { "kind", "attribute", "name", "changesID" } ); - addAnnotation( getChanges_Date(), source, new String[] { "kind", "attribute", "name", "date" } ); - addAnnotation( getChanges_Revision(), source, new String[] { "kind", "attribute", "name", "revision" } ); - addAnnotation( getChanges_Tissues(), source, new String[] { "kind", "attribute", "name", "tissues" } ); - addAnnotation( getChanges_Release(), source, new String[] { "kind", "attribute", "name", "release" } ); - addAnnotation( getChanges_Version(), source, new String[] { "kind", "attribute", "name", "version" } ); - addAnnotation( constructedAttributeEClass, source, - new String[] { "name", "tConstructedAttribute", "kind", "elementOnly" } ); - addAnnotation( getConstructedAttribute_SubDataAttribute(), source, - new String[] { "kind", "element", "name", "SubDataAttribute", "namespace", "##targetNamespace" } ); - addAnnotation( getConstructedAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( constructedAttributesEClass, source, - new String[] { "name", "tConstructedAttributes", "kind", "elementOnly" } ); - addAnnotation( getConstructedAttributes_ConstructedAttribute(), source, - new String[] { "kind", "element", "name", "ConstructedAttribute", "namespace", "##targetNamespace" } ); - addAnnotation( copyrightedEClass, source, new String[] { "name", "tCopyrighted", "kind", "elementOnly" } ); - addAnnotation( getCopyrighted_Copyright(), source, - new String[] { "kind", "element", "name", "Copyright", "namespace", "##targetNamespace" } ); - addAnnotation( copyrightNoticeEClass, source, - new String[] { "name", "tCopyrightNotice", "kind", "elementOnly" } ); - addAnnotation( getCopyrightNotice_Notice(), source, - new String[] { "kind", "element", "name", "Notice", "namespace", "##targetNamespace" } ); - addAnnotation( getCopyrightNotice_License(), source, - new String[] { "kind", "element", "name", "License", "namespace", "##targetNamespace" } ); - addAnnotation( dataAttributeEClass, source, new String[] { "name", "tDataAttribute", "kind", "empty" } ); - addAnnotation( getDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } ); - addAnnotation( getDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( dataObjectEClass, source, new String[] { "name", "tDataObject", "kind", "empty" } ); - addAnnotation( getDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( getDataObject_Transient(), source, new String[] { "kind", "attribute", "name", "transient" } ); - addAnnotation( getDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } ); - addAnnotation( dataSetMemberOfEClass, source, new String[] { "name", "tDataSetMemberOf", "kind", "empty" } ); - addAnnotation( getDataSetMemberOf_Cb(), source, new String[] { "kind", "attribute", "name", "cb" } ); - addAnnotation( definedAttributeTypeKindEEnum, source, new String[] { "name", "tDefinedAttributeTypeKind" } ); - addAnnotation( definedAttributeTypeKindObjectEDataType, source, - new String[] { "name", "tDefinedAttributeTypeKind:Object", "baseType", "tDefinedAttributeTypeKind" } ); - addAnnotation( docEClass, source, new String[] { "name", "tDoc", "kind", "mixed" } ); - addAnnotation( getDoc_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } ); - addAnnotation( getDoc_Group(), source, new String[] { "kind", "group", "name", "group:1" } ); - addAnnotation( getDoc_Any(), source, new String[] { "kind", "elementWildcard", "wildcards", "##any", "name", - ":2", "processing", "lax", "group", "#group:1" } ); - addAnnotation( getDoc_Id(), source, new String[] { "kind", "attribute", "name", "id" } ); - addAnnotation( documentedClassEClass, source, new String[] { "name", "tDocumentedClass", "kind", "empty" } ); - addAnnotation( getDocumentedClass_Deprecated(), source, - new String[] { "kind", "attribute", "name", "deprecated" } ); - addAnnotation( getDocumentedClass_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } ); - addAnnotation( getDocumentedClass_Informative(), source, - new String[] { "kind", "attribute", "name", "informative" } ); - addAnnotation( enumerationEClass, source, new String[] { "name", "tEnumeration", "kind", "elementOnly" } ); - addAnnotation( getEnumeration_Literal(), source, - new String[] { "kind", "element", "name", "Literal", "namespace", "##targetNamespace" } ); - addAnnotation( getEnumeration_InheritedFrom(), source, - new String[] { "kind", "attribute", "name", "inheritedFrom" } ); - addAnnotation( getEnumeration_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( enumerationsEClass, source, new String[] { "name", "tEnumerations", "kind", "elementOnly" } ); - addAnnotation( getEnumerations_Enumeration(), source, - new String[] { "kind", "element", "name", "Enumeration", "namespace", "##targetNamespace" } ); - addAnnotation( functionalConstraintEClass, source, - new String[] { "name", "tFunctionalConstraint", "kind", "elementOnly" } ); - addAnnotation( getFunctionalConstraint_ApplicableServices(), source, - new String[] { "kind", "element", "name", "ApplicableServices", "namespace", "##targetNamespace" } ); - addAnnotation( getFunctionalConstraint_Abbreviation(), source, - new String[] { "kind", "attribute", "name", "abbreviation" } ); - addAnnotation( getFunctionalConstraint_DescID(), source, - new String[] { "kind", "attribute", "name", "descID" } ); - addAnnotation( getFunctionalConstraint_TitleID(), source, - new String[] { "kind", "attribute", "name", "titleID" } ); - addAnnotation( functionalConstraintsEClass, source, - new String[] { "name", "tFunctionalConstraints", "kind", "elementOnly" } ); - addAnnotation( getFunctionalConstraints_FunctionalConstraint(), source, - new String[] { "kind", "element", "name", "FunctionalConstraint", "namespace", "##targetNamespace" } ); - addAnnotation( licenseEClass, source, new String[] { "name", "tLicense", "kind", "mixed" } ); - addAnnotation( getLicense_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } ); - addAnnotation( getLicense_Kind(), source, new String[] { "kind", "attribute", "name", "kind" } ); - addAnnotation( getLicense_Uri(), source, new String[] { "kind", "attribute", "name", "uri" } ); - addAnnotation( licenseKindEEnum, source, new String[] { "name", "tLicenseKind" } ); - addAnnotation( licenseKindObjectEDataType, source, - new String[] { "name", "tLicenseKind:Object", "baseType", "tLicenseKind" } ); - addAnnotation( literalEClass, source, new String[] { "name", "tLiteral", "kind", "empty" } ); - addAnnotation( getLiteral_LiteralVal(), source, new String[] { "kind", "attribute", "name", "literalVal" } ); - addAnnotation( getLiteral_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( lnClassEClass, source, new String[] { "name", "tLNClass", "kind", "elementOnly" } ); - addAnnotation( getLNClass_CanHaveLOG(), source, new String[] { "kind", "attribute", "name", "canHaveLOG" } ); - addAnnotation( getLNClass_IsExtension(), source, new String[] { "kind", "attribute", "name", "isExtension" } ); - addAnnotation( getLNClass_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( lnClassesEClass, source, new String[] { "name", "tLNClasses", "kind", "elementOnly" } ); - addAnnotation( getLNClasses_AbstractLNClass(), source, - new String[] { "kind", "element", "name", "AbstractLNClass", "namespace", "##targetNamespace" } ); - addAnnotation( getLNClasses_LNClass(), source, - new String[] { "kind", "element", "name", "LNClass", "namespace", "##targetNamespace" } ); - addAnnotation( noticeEClass, source, new String[] { "name", "tNotice", "kind", "mixed" } ); - addAnnotation( getNotice_Mixed(), source, new String[] { "kind", "elementWildcard", "name", ":mixed" } ); - addAnnotation( nsEClass, source, new String[] { "name", "tNS", "kind", "elementOnly" } ); - addAnnotation( getNS_Changes(), source, - new String[] { "kind", "element", "name", "Changes", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_DependsOn(), source, - new String[] { "kind", "element", "name", "DependsOn", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_BasicTypes(), source, - new String[] { "kind", "element", "name", "BasicTypes", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_FunctionalConstraints(), source, - new String[] { "kind", "element", "name", "FunctionalConstraints", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_PresenceConditions(), source, - new String[] { "kind", "element", "name", "PresenceConditions", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_Abbreviations(), source, - new String[] { "kind", "element", "name", "Abbreviations", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_Enumerations(), source, - new String[] { "kind", "element", "name", "Enumerations", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_ConstructedAttributes(), source, - new String[] { "kind", "element", "name", "ConstructedAttributes", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_CDCs(), source, - new String[] { "kind", "element", "name", "CDCs", "namespace", "##targetNamespace" } ); - addAnnotation( getNS_LNClasses(), source, - new String[] { "kind", "element", "name", "LNClasses", "namespace", "##targetNamespace" } ); - addAnnotation( nsDocEClass, source, new String[] { "name", "tNSDoc", "kind", "elementOnly" } ); - addAnnotation( getNSDoc_Doc(), source, - new String[] { "kind", "element", "name", "Doc", "namespace", "##targetNamespace" } ); - addAnnotation( getNSDoc_Lang(), source, new String[] { "kind", "attribute", "name", "lang" } ); - addAnnotation( presenceConditionEClass, source, - new String[] { "name", "tPresenceCondition", "kind", "empty" } ); - addAnnotation( getPresenceCondition_Argument(), source, - new String[] { "kind", "attribute", "name", "argument" } ); - addAnnotation( getPresenceCondition_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } ); - addAnnotation( getPresenceCondition_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( getPresenceCondition_TitleID(), source, - new String[] { "kind", "attribute", "name", "titleID" } ); - addAnnotation( presenceConditionsEClass, source, - new String[] { "name", "tPresenceConditions", "kind", "elementOnly" } ); - addAnnotation( getPresenceConditions_PresenceCondition(), source, - new String[] { "kind", "element", "name", "PresenceCondition", "namespace", "##targetNamespace" } ); - addAnnotation( pubStageEEnum, source, new String[] { "name", "tPubStage" } ); - addAnnotation( pubStageObjectEDataType, source, - new String[] { "name", "tPubStage:Object", "baseType", "tPubStage" } ); - addAnnotation( serviceCDCEClass, source, new String[] { "name", "tServiceCDC", "kind", "elementOnly" } ); - addAnnotation( getServiceCDC_ServiceDataAttribute(), source, - new String[] { "kind", "element", "name", "ServiceDataAttribute", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceCDC_Cdc(), source, new String[] { "kind", "attribute", "name", "cdc" } ); - addAnnotation( getServiceCDC_Variant(), source, new String[] { "kind", "attribute", "name", "variant" } ); - addAnnotation( serviceCDCsEClass, source, new String[] { "name", "tServiceCDCs", "kind", "elementOnly" } ); - addAnnotation( getServiceCDCs_ServiceCDC(), source, - new String[] { "kind", "element", "name", "ServiceCDC", "namespace", "##targetNamespace" } ); - addAnnotation( serviceConstructedAttributeEClass, source, - new String[] { "name", "tServiceConstructedAttribute", "kind", "elementOnly" } ); - addAnnotation( getServiceConstructedAttribute_TypeKindParameterized(), source, - new String[] { "kind", "attribute", "name", "typeKindParameterized" } ); - addAnnotation( serviceConstructedAttributesEClass, source, - new String[] { "name", "tServiceConstructedAttributes", "kind", "elementOnly" } ); - addAnnotation( getServiceConstructedAttributes_ServiceConstructedAttribute(), source, new String[] { "kind", - "element", "name", "ServiceConstructedAttribute", "namespace", "##targetNamespace" } ); - addAnnotation( serviceDataAttributeEClass, source, - new String[] { "name", "tServiceDataAttribute", "kind", "empty" } ); - addAnnotation( getServiceDataAttribute_Fc(), source, new String[] { "kind", "attribute", "name", "fc" } ); - addAnnotation( getServiceDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( serviceNSEClass, source, new String[] { "name", "tServiceNS", "kind", "elementOnly" } ); - addAnnotation( getServiceNS_Changes(), source, - new String[] { "kind", "element", "name", "Changes", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_FunctionalConstraints(), source, - new String[] { "kind", "element", "name", "FunctionalConstraints", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_PresenceConditions(), source, - new String[] { "kind", "element", "name", "PresenceConditions", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_Abbreviations(), source, - new String[] { "kind", "element", "name", "Abbreviations", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_ServiceTypeRealizations(), source, new String[] { "kind", "element", "name", - "ServiceTypeRealizations", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_ServiceConstructedAttributes(), source, new String[] { "kind", "element", "name", - "ServiceConstructedAttributes", "namespace", "##targetNamespace" } ); - addAnnotation( getServiceNS_ServiceCDCs(), source, - new String[] { "kind", "element", "name", "ServiceCDCs", "namespace", "##targetNamespace" } ); - addAnnotation( serviceNsUsageEClass, source, - new String[] { "name", "tServiceNsUsage", "kind", "elementOnly" } ); - addAnnotation( getServiceNsUsage_AppliesTo(), source, - new String[] { "kind", "element", "name", "AppliesTo", "namespace", "##targetNamespace" } ); - addAnnotation( serviceParameterEClass, source, new String[] { "name", "tServiceParameter", "kind", "empty" } ); - addAnnotation( getServiceParameter_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( serviceTypeRealizationsEClass, source, - new String[] { "name", "tServiceTypeRealizations", "kind", "elementOnly" } ); - addAnnotation( getServiceTypeRealizations_ServiceTypeRealization(), source, new String[] { "kind", "element", - "name", "ServiceTypeRealization", "namespace", "##targetNamespace" } ); - addAnnotation( subDataAttributeEClass, source, new String[] { "name", "tSubDataAttribute", "kind", "empty" } ); - addAnnotation( getSubDataAttribute_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( subDataObjectEClass, source, new String[] { "name", "tSubDataObject", "kind", "empty" } ); - addAnnotation( getSubDataObject_Name(), source, new String[] { "kind", "attribute", "name", "name" } ); - addAnnotation( getSubDataObject_Type(), source, new String[] { "kind", "attribute", "name", "type" } ); - addAnnotation( titledClassEClass, source, new String[] { "name", "tTitledClass", "kind", "empty" } ); - addAnnotation( getTitledClass_TitleID(), source, new String[] { "kind", "attribute", "name", "titleID" } ); - addAnnotation( undefinedAttributeTypeKindEEnum, source, - new String[] { "name", "tUndefinedAttributeTypeKind" } ); - addAnnotation( undefinedAttributeTypeKindObjectEDataType, source, new String[] { "name", - "tUndefinedAttributeTypeKind:Object", "baseType", "tUndefinedAttributeTypeKind" } ); - addAnnotation( getAgNSIdentification_Release(), source, - new String[] { "kind", "attribute", "name", "release" } ); - addAnnotation( getAgNSIdentification_Version(), source, - new String[] { "kind", "attribute", "name", "version" } ); - addAnnotation( getAgNSIdentification_Id(), source, new String[] { "kind", "attribute", "name", "id" } ); - addAnnotation( getAgNSIdentification_Revision(), source, - new String[] { "kind", "attribute", "name", "revision" } ); - addAnnotation( getAgNSIdentification_PublicationStage(), source, - new String[] { "kind", "attribute", "name", "publicationStage" } ); - addAnnotation( getAgPresenceCondition_PresCond(), source, - new String[] { "kind", "attribute", "name", "presCond" } ); - addAnnotation( getAgPresenceCondition_PresCondArgs(), source, - new String[] { "kind", "attribute", "name", "presCondArgs" } ); - addAnnotation( getAgPresenceCondition_PresCondArgsID(), source, - new String[] { "kind", "attribute", "name", "presCondArgsID" } ); - addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCond(), source, - new String[] { "kind", "attribute", "name", "dsPresCond" } ); - addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCondArgs(), source, - new String[] { "kind", "attribute", "name", "dsPresCondArgs" } ); - addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCondArgsID(), source, - new String[] { "kind", "attribute", "name", "dsPresCondArgsID" } ); - addAnnotation( getAgArray_IsArray(), source, new String[] { "kind", "attribute", "name", "isArray" } ); - addAnnotation( getAgArray_MaxIndexAttribute(), source, - new String[] { "kind", "attribute", "name", "maxIndexAttribute" } ); - addAnnotation( getAgArray_MinIndex(), source, new String[] { "kind", "attribute", "name", "minIndex" } ); - addAnnotation( getAgArray_SizeAttribute(), source, - new String[] { "kind", "attribute", "name", "sizeAttribute" } ); - addAnnotation( getAgTrgOp_Dchg(), source, new String[] { "kind", "attribute", "name", "dchg" } ); - addAnnotation( getAgTrgOp_Dupd(), source, new String[] { "kind", "attribute", "name", "dupd" } ); - addAnnotation( getAgTrgOp_Qchg(), source, new String[] { "kind", "attribute", "name", "qchg" } ); - addAnnotation( getAgAttributeType_Type(), source, new String[] { "kind", "attribute", "name", "type" } ); - addAnnotation( getAgAttributeType_TypeKind(), source, - new String[] { "kind", "attribute", "name", "typeKind" } ); - addAnnotation( getAgAttributeTypeAndValues_DefaultValue(), source, - new String[] { "kind", "attribute", "name", "defaultValue" } ); - addAnnotation( getAgAttributeTypeAndValues_MaxValue(), source, - new String[] { "kind", "attribute", "name", "maxValue" } ); - addAnnotation( getAgAttributeTypeAndValues_MinValue(), source, - new String[] { "kind", "attribute", "name", "minValue" } ); - addAnnotation( getAgUnderlyingType_UnderlyingType(), source, - new String[] { "kind", "attribute", "name", "underlyingType" } ); - addAnnotation( getAgUnderlyingType_UnderlyingTypeKind(), source, - new String[] { "kind", "attribute", "name", "underlyingTypeKind" } ); - addAnnotation( getAgUML_UmlDate(), source, new String[] { "kind", "attribute", "name", "umlDate" } ); - addAnnotation( getAgUML_UmlVersion(), source, new String[] { "kind", "attribute", "name", "umlVersion" } ); - addAnnotation( getAgNSdesc_DescID(), source, new String[] { "kind", "attribute", "name", "descID" } ); + addAnnotation( appliesToTypeEClass, + source, + new String[] { + "name", "AppliesTo_._type", + "kind", "empty" + } ); + addAnnotation( dependsOnEClass, + source, + new String[] { + "name", "DependsOn_._type", + "kind", "empty" + } ); + addAnnotation( documentRootEClass, + source, + new String[] { + "name", "", + "kind", "mixed" + } ); + addAnnotation( getDocumentRoot_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + } ); + addAnnotation( getDocumentRoot_XMLNSPrefixMap(), + source, + new String[] { + "kind", "attribute", + "name", "xmlns:prefix" + } ); + addAnnotation( getDocumentRoot_XSISchemaLocation(), + source, + new String[] { + "kind", "attribute", + "name", "xsi:schemaLocation" + } ); + addAnnotation( getDocumentRoot_ApplicableServiceNS(), + source, + new String[] { + "kind", "element", + "name", "ApplicableServiceNS", + "namespace", "##targetNamespace" + } ); + addAnnotation( getDocumentRoot_NS(), + source, + new String[] { + "kind", "element", + "name", "NS", + "namespace", "##targetNamespace" + } ); + addAnnotation( getDocumentRoot_NSDoc(), + source, + new String[] { + "kind", "element", + "name", "NSDoc", + "namespace", "##targetNamespace" + } ); + addAnnotation( getDocumentRoot_ServiceNS(), + source, + new String[] { + "kind", "element", + "name", "ServiceNS", + "namespace", "##targetNamespace" + } ); + addAnnotation( serviceTypeEClass, + source, + new String[] { + "name", "Service_._type", + "kind", "empty" + } ); + addAnnotation( getServiceType_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( abbreviationEClass, + source, + new String[] { + "name", "tAbbreviation", + "kind", "empty" + } ); + addAnnotation( getAbbreviation_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); + addAnnotation( getAbbreviation_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( abbreviationsEClass, + source, + new String[] { + "name", "tAbbreviations", + "kind", "elementOnly" + } ); + addAnnotation( getAbbreviations_Abbreviation(), + source, + new String[] { + "kind", "element", + "name", "Abbreviation", + "namespace", "##targetNamespace" + } ); + addAnnotation( abstractLNClassEClass, + source, + new String[] { + "name", "tAbstractLNClass", + "kind", "elementOnly" + } ); + addAnnotation( getAbstractLNClass_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( acsiServicesKindEEnum, + source, + new String[] { + "name", "tACSIServicesKind" + } ); + addAnnotation( acsiServicesKindObjectEDataType, + source, + new String[] { + "name", "tACSIServicesKind:Object", + "baseType", "tACSIServicesKind" + } ); + addAnnotation( anyLNClassEClass, + source, + new String[] { + "name", "tAnyLNClass", + "kind", "elementOnly" + } ); + addAnnotation( getAnyLNClass_DataObject(), + source, + new String[] { + "kind", "element", + "name", "DataObject", + "namespace", "##targetNamespace" + } ); + addAnnotation( getAnyLNClass_Base(), + source, + new String[] { + "kind", "attribute", + "name", "base" + } ); + addAnnotation( applicableServiceNSEClass, + source, + new String[] { + "name", "tApplicableServiceNS", + "kind", "elementOnly" + } ); + addAnnotation( getApplicableServiceNS_ServiceNsUsage(), + source, + new String[] { + "kind", "element", + "name", "ServiceNsUsage", + "namespace", "##targetNamespace" + } ); + addAnnotation( getApplicableServiceNS_Date(), + source, + new String[] { + "kind", "attribute", + "name", "date" + } ); + addAnnotation( getApplicableServiceNS_Version(), + source, + new String[] { + "kind", "attribute", + "name", "version" + } ); + addAnnotation( applicableServicesEClass, + source, + new String[] { + "name", "tApplicableServices", + "kind", "elementOnly" + } ); + addAnnotation( getApplicableServices_Service(), + source, + new String[] { + "kind", "element", + "name", "Service", + "namespace", "##targetNamespace" + } ); + addAnnotation( getApplicableServices_DataSetMemberOf(), + source, + new String[] { + "kind", "element", + "name", "DataSetMemberOf", + "namespace", "##targetNamespace" + } ); + addAnnotation( attributeTypeKindEDataType, + source, + new String[] { + "name", "tAttributeTypeKind", + "memberTypes", "tDefinedAttributeTypeKind tUndefinedAttributeTypeKind" + } ); + addAnnotation( basicTypeEClass, + source, + new String[] { + "name", "tBasicType", + "kind", "empty" + } ); + addAnnotation( getBasicType_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); + addAnnotation( getBasicType_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( basicTypesEClass, + source, + new String[] { + "name", "tBasicTypes", + "kind", "elementOnly" + } ); + addAnnotation( getBasicTypes_BasicType(), + source, + new String[] { + "kind", "element", + "name", "BasicType", + "namespace", "##targetNamespace" + } ); + addAnnotation( cbKindEEnum, + source, + new String[] { + "name", "tCBKind" + } ); + addAnnotation( cbKindObjectEDataType, + source, + new String[] { + "name", "tCBKind:Object", + "baseType", "tCBKind" + } ); + addAnnotation( cdcEClass, + source, + new String[] { + "name", "tCDC", + "kind", "elementOnly" + } ); + addAnnotation( getCDC_SubDataObject(), + source, + new String[] { + "kind", "element", + "name", "SubDataObject", + "namespace", "##targetNamespace" + } ); + addAnnotation( getCDC_DataAttribute(), + source, + new String[] { + "kind", "element", + "name", "DataAttribute", + "namespace", "##targetNamespace" + } ); + addAnnotation( getCDC_ServiceParameter(), + source, + new String[] { + "kind", "element", + "name", "ServiceParameter", + "namespace", "##targetNamespace" + } ); + addAnnotation( getCDC_EnumParameterized(), + source, + new String[] { + "kind", "attribute", + "name", "enumParameterized" + } ); + addAnnotation( getCDC_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( getCDC_Statistics(), + source, + new String[] { + "kind", "attribute", + "name", "statistics" + } ); + addAnnotation( getCDC_TypeKindParameterized(), + source, + new String[] { + "kind", "attribute", + "name", "typeKindParameterized" + } ); + addAnnotation( getCDC_Variant(), + source, + new String[] { + "kind", "attribute", + "name", "variant" + } ); + addAnnotation( cdCsEClass, + source, + new String[] { + "name", "tCDCs", + "kind", "elementOnly" + } ); + addAnnotation( getCDCs_CDC(), + source, + new String[] { + "kind", "element", + "name", "CDC", + "namespace", "##targetNamespace" + } ); + addAnnotation( changesEClass, + source, + new String[] { + "name", "tChanges", + "kind", "empty" + } ); + addAnnotation( getChanges_ChangesID(), + source, + new String[] { + "kind", "attribute", + "name", "changesID" + } ); + addAnnotation( getChanges_Date(), + source, + new String[] { + "kind", "attribute", + "name", "date" + } ); + addAnnotation( getChanges_Revision(), + source, + new String[] { + "kind", "attribute", + "name", "revision" + } ); + addAnnotation( getChanges_Tissues(), + source, + new String[] { + "kind", "attribute", + "name", "tissues" + } ); + addAnnotation( getChanges_Release(), + source, + new String[] { + "kind", "attribute", + "name", "release" + } ); + addAnnotation( getChanges_Version(), + source, + new String[] { + "kind", "attribute", + "name", "version" + } ); + addAnnotation( constructedAttributeEClass, + source, + new String[] { + "name", "tConstructedAttribute", + "kind", "elementOnly" + } ); + addAnnotation( getConstructedAttribute_SubDataAttribute(), + source, + new String[] { + "kind", "element", + "name", "SubDataAttribute", + "namespace", "##targetNamespace" + } ); + addAnnotation( getConstructedAttribute_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( constructedAttributesEClass, + source, + new String[] { + "name", "tConstructedAttributes", + "kind", "elementOnly" + } ); + addAnnotation( getConstructedAttributes_ConstructedAttribute(), + source, + new String[] { + "kind", "element", + "name", "ConstructedAttribute", + "namespace", "##targetNamespace" + } ); + addAnnotation( copyrightedEClass, + source, + new String[] { + "name", "tCopyrighted", + "kind", "elementOnly" + } ); + addAnnotation( getCopyrighted_Copyright(), + source, + new String[] { + "kind", "element", + "name", "Copyright", + "namespace", "##targetNamespace" + } ); + addAnnotation( copyrightNoticeEClass, + source, + new String[] { + "name", "tCopyrightNotice", + "kind", "elementOnly" + } ); + addAnnotation( getCopyrightNotice_Notice(), + source, + new String[] { + "kind", "element", + "name", "Notice", + "namespace", "##targetNamespace" + } ); + addAnnotation( getCopyrightNotice_License(), + source, + new String[] { + "kind", "element", + "name", "License", + "namespace", "##targetNamespace" + } ); + addAnnotation( dataAttributeEClass, + source, + new String[] { + "name", "tDataAttribute", + "kind", "empty" + } ); + addAnnotation( getDataAttribute_Fc(), + source, + new String[] { + "kind", "attribute", + "name", "fc" + } ); + addAnnotation( getDataAttribute_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( dataObjectEClass, + source, + new String[] { + "name", "tDataObject", + "kind", "empty" + } ); + addAnnotation( getDataObject_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( getDataObject_Transient(), + source, + new String[] { + "kind", "attribute", + "name", "transient" + } ); + addAnnotation( getDataObject_Type(), + source, + new String[] { + "kind", "attribute", + "name", "type" + } ); + addAnnotation( dataSetMemberOfEClass, + source, + new String[] { + "name", "tDataSetMemberOf", + "kind", "empty" + } ); + addAnnotation( getDataSetMemberOf_Cb(), + source, + new String[] { + "kind", "attribute", + "name", "cb" + } ); + addAnnotation( definedAttributeTypeKindEEnum, + source, + new String[] { + "name", "tDefinedAttributeTypeKind" + } ); + addAnnotation( definedAttributeTypeKindObjectEDataType, + source, + new String[] { + "name", "tDefinedAttributeTypeKind:Object", + "baseType", "tDefinedAttributeTypeKind" + } ); + addAnnotation( docEClass, + source, + new String[] { + "name", "tDoc", + "kind", "mixed" + } ); + addAnnotation( getDoc_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + } ); + addAnnotation( getDoc_Group(), + source, + new String[] { + "kind", "group", + "name", "group:1" + } ); + addAnnotation( getDoc_Any(), + source, + new String[] { + "kind", "elementWildcard", + "wildcards", "##any", + "name", ":2", + "processing", "lax", + "group", "#group:1" + } ); + addAnnotation( getDoc_Id(), + source, + new String[] { + "kind", "attribute", + "name", "id" + } ); + addAnnotation( documentedClassEClass, + source, + new String[] { + "name", "tDocumentedClass", + "kind", "empty" + } ); + addAnnotation( getDocumentedClass_Deprecated(), + source, + new String[] { + "kind", "attribute", + "name", "deprecated" + } ); + addAnnotation( getDocumentedClass_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); + addAnnotation( getDocumentedClass_Informative(), + source, + new String[] { + "kind", "attribute", + "name", "informative" + } ); + addAnnotation( enumerationEClass, + source, + new String[] { + "name", "tEnumeration", + "kind", "elementOnly" + } ); + addAnnotation( getEnumeration_Literal(), + source, + new String[] { + "kind", "element", + "name", "Literal", + "namespace", "##targetNamespace" + } ); + addAnnotation( getEnumeration_InheritedFrom(), + source, + new String[] { + "kind", "attribute", + "name", "inheritedFrom" + } ); + addAnnotation( getEnumeration_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( enumerationsEClass, + source, + new String[] { + "name", "tEnumerations", + "kind", "elementOnly" + } ); + addAnnotation( getEnumerations_Enumeration(), + source, + new String[] { + "kind", "element", + "name", "Enumeration", + "namespace", "##targetNamespace" + } ); + addAnnotation( functionalConstraintEClass, + source, + new String[] { + "name", "tFunctionalConstraint", + "kind", "elementOnly" + } ); + addAnnotation( getFunctionalConstraint_ApplicableServices(), + source, + new String[] { + "kind", "element", + "name", "ApplicableServices", + "namespace", "##targetNamespace" + } ); + addAnnotation( getFunctionalConstraint_Abbreviation(), + source, + new String[] { + "kind", "attribute", + "name", "abbreviation" + } ); + addAnnotation( getFunctionalConstraint_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); + addAnnotation( getFunctionalConstraint_TitleID(), + source, + new String[] { + "kind", "attribute", + "name", "titleID" + } ); + addAnnotation( functionalConstraintsEClass, + source, + new String[] { + "name", "tFunctionalConstraints", + "kind", "elementOnly" + } ); + addAnnotation( getFunctionalConstraints_FunctionalConstraint(), + source, + new String[] { + "kind", "element", + "name", "FunctionalConstraint", + "namespace", "##targetNamespace" + } ); + addAnnotation( licenseEClass, + source, + new String[] { + "name", "tLicense", + "kind", "mixed" + } ); + addAnnotation( getLicense_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + } ); + addAnnotation( getLicense_Kind(), + source, + new String[] { + "kind", "attribute", + "name", "kind" + } ); + addAnnotation( getLicense_Uri(), + source, + new String[] { + "kind", "attribute", + "name", "uri" + } ); + addAnnotation( licenseKindEEnum, + source, + new String[] { + "name", "tLicenseKind" + } ); + addAnnotation( licenseKindObjectEDataType, + source, + new String[] { + "name", "tLicenseKind:Object", + "baseType", "tLicenseKind" + } ); + addAnnotation( literalEClass, + source, + new String[] { + "name", "tLiteral", + "kind", "empty" + } ); + addAnnotation( getLiteral_LiteralVal(), + source, + new String[] { + "kind", "attribute", + "name", "literalVal" + } ); + addAnnotation( getLiteral_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( lnClassEClass, + source, + new String[] { + "name", "tLNClass", + "kind", "elementOnly" + } ); + addAnnotation( getLNClass_CanHaveLOG(), + source, + new String[] { + "kind", "attribute", + "name", "canHaveLOG" + } ); + addAnnotation( getLNClass_IsExtension(), + source, + new String[] { + "kind", "attribute", + "name", "isExtension" + } ); + addAnnotation( getLNClass_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( lnClassesEClass, + source, + new String[] { + "name", "tLNClasses", + "kind", "elementOnly" + } ); + addAnnotation( getLNClasses_AbstractLNClass(), + source, + new String[] { + "kind", "element", + "name", "AbstractLNClass", + "namespace", "##targetNamespace" + } ); + addAnnotation( getLNClasses_LNClass(), + source, + new String[] { + "kind", "element", + "name", "LNClass", + "namespace", "##targetNamespace" + } ); + addAnnotation( noticeEClass, + source, + new String[] { + "name", "tNotice", + "kind", "mixed" + } ); + addAnnotation( getNotice_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + } ); + addAnnotation( nsEClass, + source, + new String[] { + "name", "tNS", + "kind", "elementOnly" + } ); + addAnnotation( getNS_Changes(), + source, + new String[] { + "kind", "element", + "name", "Changes", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_DependsOn(), + source, + new String[] { + "kind", "element", + "name", "DependsOn", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_BasicTypes(), + source, + new String[] { + "kind", "element", + "name", "BasicTypes", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_FunctionalConstraints(), + source, + new String[] { + "kind", "element", + "name", "FunctionalConstraints", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_PresenceConditions(), + source, + new String[] { + "kind", "element", + "name", "PresenceConditions", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_Abbreviations(), + source, + new String[] { + "kind", "element", + "name", "Abbreviations", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_Enumerations(), + source, + new String[] { + "kind", "element", + "name", "Enumerations", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_ConstructedAttributes(), + source, + new String[] { + "kind", "element", + "name", "ConstructedAttributes", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_CDCs(), + source, + new String[] { + "kind", "element", + "name", "CDCs", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNS_LNClasses(), + source, + new String[] { + "kind", "element", + "name", "LNClasses", + "namespace", "##targetNamespace" + } ); + addAnnotation( nsDocEClass, + source, + new String[] { + "name", "tNSDoc", + "kind", "elementOnly" + } ); + addAnnotation( getNSDoc_Doc(), + source, + new String[] { + "kind", "element", + "name", "Doc", + "namespace", "##targetNamespace" + } ); + addAnnotation( getNSDoc_Lang(), + source, + new String[] { + "kind", "attribute", + "name", "lang" + } ); + addAnnotation( presenceConditionEClass, + source, + new String[] { + "name", "tPresenceCondition", + "kind", "empty" + } ); + addAnnotation( getPresenceCondition_Argument(), + source, + new String[] { + "kind", "attribute", + "name", "argument" + } ); + addAnnotation( getPresenceCondition_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); + addAnnotation( getPresenceCondition_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( getPresenceCondition_TitleID(), + source, + new String[] { + "kind", "attribute", + "name", "titleID" + } ); + addAnnotation( presenceConditionsEClass, + source, + new String[] { + "name", "tPresenceConditions", + "kind", "elementOnly" + } ); + addAnnotation( getPresenceConditions_PresenceCondition(), + source, + new String[] { + "kind", "element", + "name", "PresenceCondition", + "namespace", "##targetNamespace" + } ); + addAnnotation( pubStageEEnum, + source, + new String[] { + "name", "tPubStage" + } ); + addAnnotation( pubStageObjectEDataType, + source, + new String[] { + "name", "tPubStage:Object", + "baseType", "tPubStage" + } ); + addAnnotation( serviceCDCEClass, + source, + new String[] { + "name", "tServiceCDC", + "kind", "elementOnly" + } ); + addAnnotation( getServiceCDC_ServiceDataAttribute(), + source, + new String[] { + "kind", "element", + "name", "ServiceDataAttribute", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceCDC_Cdc(), + source, + new String[] { + "kind", "attribute", + "name", "cdc" + } ); + addAnnotation( getServiceCDC_Variant(), + source, + new String[] { + "kind", "attribute", + "name", "variant" + } ); + addAnnotation( serviceCDCsEClass, + source, + new String[] { + "name", "tServiceCDCs", + "kind", "elementOnly" + } ); + addAnnotation( getServiceCDCs_ServiceCDC(), + source, + new String[] { + "kind", "element", + "name", "ServiceCDC", + "namespace", "##targetNamespace" + } ); + addAnnotation( serviceConstructedAttributeEClass, + source, + new String[] { + "name", "tServiceConstructedAttribute", + "kind", "elementOnly" + } ); + addAnnotation( getServiceConstructedAttribute_TypeKindParameterized(), + source, + new String[] { + "kind", "attribute", + "name", "typeKindParameterized" + } ); + addAnnotation( serviceConstructedAttributesEClass, + source, + new String[] { + "name", "tServiceConstructedAttributes", + "kind", "elementOnly" + } ); + addAnnotation( getServiceConstructedAttributes_ServiceConstructedAttribute(), + source, + new String[] { + "kind", "element", + "name", "ServiceConstructedAttribute", + "namespace", "##targetNamespace" + } ); + addAnnotation( serviceDataAttributeEClass, + source, + new String[] { + "name", "tServiceDataAttribute", + "kind", "empty" + } ); + addAnnotation( getServiceDataAttribute_Fc(), + source, + new String[] { + "kind", "attribute", + "name", "fc" + } ); + addAnnotation( getServiceDataAttribute_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( serviceNSEClass, + source, + new String[] { + "name", "tServiceNS", + "kind", "elementOnly" + } ); + addAnnotation( getServiceNS_Changes(), + source, + new String[] { + "kind", "element", + "name", "Changes", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_FunctionalConstraints(), + source, + new String[] { + "kind", "element", + "name", "FunctionalConstraints", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_PresenceConditions(), + source, + new String[] { + "kind", "element", + "name", "PresenceConditions", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_Abbreviations(), + source, + new String[] { + "kind", "element", + "name", "Abbreviations", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_ServiceTypeRealizations(), + source, + new String[] { + "kind", "element", + "name", "ServiceTypeRealizations", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_ServiceConstructedAttributes(), + source, + new String[] { + "kind", "element", + "name", "ServiceConstructedAttributes", + "namespace", "##targetNamespace" + } ); + addAnnotation( getServiceNS_ServiceCDCs(), + source, + new String[] { + "kind", "element", + "name", "ServiceCDCs", + "namespace", "##targetNamespace" + } ); + addAnnotation( serviceNsUsageEClass, + source, + new String[] { + "name", "tServiceNsUsage", + "kind", "elementOnly" + } ); + addAnnotation( getServiceNsUsage_AppliesTo(), + source, + new String[] { + "kind", "element", + "name", "AppliesTo", + "namespace", "##targetNamespace" + } ); + addAnnotation( serviceParameterEClass, + source, + new String[] { + "name", "tServiceParameter", + "kind", "empty" + } ); + addAnnotation( getServiceParameter_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( serviceTypeRealizationsEClass, + source, + new String[] { + "name", "tServiceTypeRealizations", + "kind", "elementOnly" + } ); + addAnnotation( getServiceTypeRealizations_ServiceTypeRealization(), + source, + new String[] { + "kind", "element", + "name", "ServiceTypeRealization", + "namespace", "##targetNamespace" + } ); + addAnnotation( subDataAttributeEClass, + source, + new String[] { + "name", "tSubDataAttribute", + "kind", "empty" + } ); + addAnnotation( getSubDataAttribute_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( subDataObjectEClass, + source, + new String[] { + "name", "tSubDataObject", + "kind", "empty" + } ); + addAnnotation( getSubDataObject_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + } ); + addAnnotation( getSubDataObject_Type(), + source, + new String[] { + "kind", "attribute", + "name", "type" + } ); + addAnnotation( titledClassEClass, + source, + new String[] { + "name", "tTitledClass", + "kind", "empty" + } ); + addAnnotation( getTitledClass_TitleID(), + source, + new String[] { + "kind", "attribute", + "name", "titleID" + } ); + addAnnotation( undefinedAttributeTypeKindEEnum, + source, + new String[] { + "name", "tUndefinedAttributeTypeKind" + } ); + addAnnotation( undefinedAttributeTypeKindObjectEDataType, + source, + new String[] { + "name", "tUndefinedAttributeTypeKind:Object", + "baseType", "tUndefinedAttributeTypeKind" + } ); + addAnnotation( getAgNSIdentification_Release(), + source, + new String[] { + "kind", "attribute", + "name", "release" + } ); + addAnnotation( getAgNSIdentification_Version(), + source, + new String[] { + "kind", "attribute", + "name", "version" + } ); + addAnnotation( getAgNSIdentification_Id(), + source, + new String[] { + "kind", "attribute", + "name", "id" + } ); + addAnnotation( getAgNSIdentification_Revision(), + source, + new String[] { + "kind", "attribute", + "name", "revision" + } ); + addAnnotation( getAgNSIdentification_PublicationStage(), + source, + new String[] { + "kind", "attribute", + "name", "publicationStage" + } ); + addAnnotation( getAgPresenceCondition_PresCond(), + source, + new String[] { + "kind", "attribute", + "name", "presCond" + } ); + addAnnotation( getAgPresenceCondition_PresCondArgs(), + source, + new String[] { + "kind", "attribute", + "name", "presCondArgs" + } ); + addAnnotation( getAgPresenceCondition_PresCondArgsID(), + source, + new String[] { + "kind", "attribute", + "name", "presCondArgsID" + } ); + addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCond(), + source, + new String[] { + "kind", "attribute", + "name", "dsPresCond" + } ); + addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCondArgs(), + source, + new String[] { + "kind", "attribute", + "name", "dsPresCondArgs" + } ); + addAnnotation( getAgPresenceConditionDerivedStatistics_DsPresCondArgsID(), + source, + new String[] { + "kind", "attribute", + "name", "dsPresCondArgsID" + } ); + addAnnotation( getAgArray_IsArray(), + source, + new String[] { + "kind", "attribute", + "name", "isArray" + } ); + addAnnotation( getAgArray_MaxIndexAttribute(), + source, + new String[] { + "kind", "attribute", + "name", "maxIndexAttribute" + } ); + addAnnotation( getAgArray_MinIndex(), + source, + new String[] { + "kind", "attribute", + "name", "minIndex" + } ); + addAnnotation( getAgArray_SizeAttribute(), + source, + new String[] { + "kind", "attribute", + "name", "sizeAttribute" + } ); + addAnnotation( getAgTrgOp_Dchg(), + source, + new String[] { + "kind", "attribute", + "name", "dchg" + } ); + addAnnotation( getAgTrgOp_Dupd(), + source, + new String[] { + "kind", "attribute", + "name", "dupd" + } ); + addAnnotation( getAgTrgOp_Qchg(), + source, + new String[] { + "kind", "attribute", + "name", "qchg" + } ); + addAnnotation( getAgAttributeType_Type(), + source, + new String[] { + "kind", "attribute", + "name", "type" + } ); + addAnnotation( getAgAttributeType_TypeKind(), + source, + new String[] { + "kind", "attribute", + "name", "typeKind" + } ); + addAnnotation( getAgAttributeTypeAndValues_DefaultValue(), + source, + new String[] { + "kind", "attribute", + "name", "defaultValue" + } ); + addAnnotation( getAgAttributeTypeAndValues_MaxValue(), + source, + new String[] { + "kind", "attribute", + "name", "maxValue" + } ); + addAnnotation( getAgAttributeTypeAndValues_MinValue(), + source, + new String[] { + "kind", "attribute", + "name", "minValue" + } ); + addAnnotation( getAgUnderlyingType_UnderlyingType(), + source, + new String[] { + "kind", "attribute", + "name", "underlyingType" + } ); + addAnnotation( getAgUnderlyingType_UnderlyingTypeKind(), + source, + new String[] { + "kind", "attribute", + "name", "underlyingTypeKind" + } ); + addAnnotation( getAgUML_UmlDate(), + source, + new String[] { + "kind", "attribute", + "name", "umlDate" + } ); + addAnnotation( getAgUML_UmlVersion(), + source, + new String[] { + "kind", "attribute", + "name", "umlVersion" + } ); + addAnnotation( getAgNSdesc_DescID(), + source, + new String[] { + "kind", "attribute", + "name", "descID" + } ); } /** @@ -5675,100 +6772,236 @@ public class NsdPackageImpl extends EPackageImpl implements NsdPackage { */ protected void createPivotAnnotations() { String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; - addAnnotation( serviceTypeEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( abbreviationEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( abbreviationsEClass, source, new String[] { "uniqueAbbreviation", - "Tuple {\n\tmessage : String = \'There shall not be two Abbreviations elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.abbreviation->isUnique( a : Abbreviation | a.name )\n}.status" } ); - addAnnotation( abstractLNClassEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( anyLNClassEClass, source, new String[] { "uniqueDataObject", - "Tuple {\n\tmessage : String = \'For an AnyLNClass, there shall not be two DataObject sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: base AbstractLNClass should be taken into account\n\t\t\t-- For this, explicit links have to be created first\n\t\t\tself.dataObject->isUnique( d : DataObject | d.name )\n}.status" } ); - addAnnotation( applicableServiceNSEClass, source, new String[] { "versionAttributeRequired", - "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status", - "dateAttributeRequired", - "Tuple {\n\tmessage : String = \'The date attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.date <> null\n}.status" } ); - addAnnotation( applicableServicesEClass, source, new String[] { "uniqueDataSetMemberOf", - "Tuple {\n\tmessage : String = \'For an ApplicableServices, there shall not be two DataSetMemberOf sub-elements with same cb.\',\n\tstatus : Boolean = \n\t\t\tself.dataSetMemberOf->isUnique( d : DataSetMemberOf | d.cb )\n}.status", - "uniqueService", - "Tuple {\n\tmessage : String = \'For an ApplicableServices, there shall not be two ServiceType sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.service->isUnique( s : ServiceType | s.name )\n}.status" } ); - addAnnotation( basicTypeEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( cdcEClass, source, new String[] { "uniqueCDCChild", - "Tuple {\n\tmessage : String = \'For a CDC, there shall not be two sub-elements (SubDataObject or DataAttribute) with same name.\',\n\tstatus : Boolean = \n\t\t\tlet names : Bag(String) = self.subDataObject.name->union(self.dataAttribute.name) in names->size() = names->asSet()->size()\n}.status", - "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( cdCsEClass, source, new String[] { "uniqueCDC", - "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two CDC sub-elements with same name and (if defined) variant.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.cDC->select( c : CDC | c.variant = null )->isUnique( c : CDC | c.name )\n\t or self.cDC->select( c : CDC | c.variant <> null )->forAll( c1, c2 : CDC | c1 <> c2 implies c1.name <> c2.name or c1.variant <> c2.variant )\n}.status" } ); - addAnnotation( changesEClass, source, new String[] { "versionAttributeRequired", - "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status" } ); - addAnnotation( constructedAttributeEClass, source, new String[] { "uniqueSubDataAttribute", - "Tuple {\n\tmessage : String = \'For a ConstructedAttribute, there shall not be two SubDataAttribute sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.subDataAttribute->isUnique( s : SubDataAttribute | s.name )\n}.status", - "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( constructedAttributesEClass, source, new String[] { "uniqueConstructedAttribute", - "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two ConstructedAttribute sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.constructedAttribute->isUnique( c : ConstructedAttribute | c.name )\n}.status" } ); - addAnnotation( dataAttributeEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", - "fcAttributeRequired", - "Tuple {\n\tmessage : String = \'The fc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.fc <> null\n}.status" } ); - addAnnotation( dataObjectEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", - "typeAttributeRequired", - "Tuple {\n\tmessage : String = \'The type attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.type <> null\n}.status" } ); - addAnnotation( dataSetMemberOfEClass, source, new String[] { "cbAttributeRequired", - "Tuple {\n\tmessage : String = \'The cb attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.cb <> null\n}.status" } ); - addAnnotation( docEClass, source, new String[] { "idAttributeRequired", - "Tuple {\n\tmessage : String = \'The id attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.id <> null\n}.status" } ); - addAnnotation( enumerationEClass, source, new String[] { "uniqueLiteralName", - "Tuple {\n\tmessage : String = \'For an Enumeration, there shall not be two Literal sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: inherited literals should be taken into account\n\t\t\t-- For this, explicit links have to be created first\n\t\t\tself.literal->isUnique( l : Literal | l.name )\n}.status", - "uniqueLiteralVal", - "Tuple {\n\tmessage : String = \'For an Enumeration, there shall not be two Literal sub-elements with same literalVal.\',\n\tstatus : Boolean = \n\t\t\tself.literal->isUnique( l : Literal | l.literalVal )\n}.status", - "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( enumerationsEClass, source, new String[] { "uniqueEnumeration", - "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two Enumeration sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.enumeration->isUnique( e : Enumeration | e.name )\n}.status" } ); - addAnnotation( functionalConstraintEClass, source, new String[] { "abbreviationAttributeRequired", - "Tuple {\n\tmessage : String = \'The abbreviation attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.abbreviation <> null\n}.status" } ); - addAnnotation( functionalConstraintsEClass, source, new String[] { "uniqueFunctionalConstraint", - "Tuple {\n\tmessage : String = \'There shall not be two FunctionalConstraint elements with same abbreviation.\',\n\tstatus : Boolean = \n\t\t\tself.functionalConstraint->isUnique( f : FunctionalConstraint | f.abbreviation )\n}.status" } ); - addAnnotation( literalEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", - "literalValAttributeRequired", - "Tuple {\n\tmessage : String = \'The literalVal attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.literalVal <> null\n}.status" } ); - addAnnotation( lnClassEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( lnClassesEClass, source, new String[] { "uniqueAbstractLNClass", - "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two AbstractLNClass sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.abstractLNClass->isUnique( c : AbstractLNClass | c.name )\n}.status", - "uniqueLNClass", - "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two LNClass sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.lNClass->isUnique( c : LNClass | c.name )\n}.status" } ); - addAnnotation( nsDocEClass, source, new String[] { "langAttributeRequired", - "Tuple {\n\tmessage : String = \'The lang attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.lang <> null\n}.status" } ); - addAnnotation( presenceConditionEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( presenceConditionsEClass, source, new String[] { "uniquePresenceCondition", - "Tuple {\n\tmessage : String = \'There shall not be two PresenceCondition elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.presenceCondition->isUnique( p : PresenceCondition | p.name )\n}.status" } ); - addAnnotation( serviceCDCEClass, source, new String[] { "cdcAttributeRequired", - "Tuple {\n\tmessage : String = \'The cdc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.cdc <> null\n}.status" } ); - addAnnotation( serviceDataAttributeEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", - "fcAttributeRequired", - "Tuple {\n\tmessage : String = \'The fc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.fc <> null\n}.status" } ); - addAnnotation( serviceParameterEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( subDataAttributeEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" } ); - addAnnotation( subDataObjectEClass, source, new String[] { "nameAttributeRequired", - "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", - "typeAttributeRequired", - "Tuple {\n\tmessage : String = \'The type attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.type <> null\n}.status" } ); - addAnnotation( titledClassEClass, source, new String[] { "titleIDAttributeRequired", - "Tuple {\n\tmessage : String = \'The titleID attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.titleID <> null\n}.status" } ); - addAnnotation( agNSIdentificationEClass, source, new String[] { "idAttributeRequired", - "Tuple {\n\tmessage : String = \'The id attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.id <> null\n}.status", - "versionAttributeRequired", - "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status" } ); + addAnnotation( serviceTypeEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( abbreviationEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( abbreviationsEClass, + source, + new String[] { + "uniqueAbbreviation", + "Tuple {\n\tmessage : String = \'There shall not be two Abbreviations elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.abbreviation->isUnique( a : Abbreviation | a.name )\n}.status" + } ); + addAnnotation( abstractLNClassEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( anyLNClassEClass, + source, + new String[] { + "uniqueDataObject", + "Tuple {\n\tmessage : String = \'For an AnyLNClass, there shall not be two DataObject sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: base AbstractLNClass should be taken into account\n\t\t\t-- For this, explicit links have to be created first\n\t\t\tself.dataObject->isUnique( d : DataObject | d.name )\n}.status" + } ); + addAnnotation( applicableServiceNSEClass, + source, + new String[] { + "versionAttributeRequired", + "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status", + "dateAttributeRequired", + "Tuple {\n\tmessage : String = \'The date attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.date <> null\n}.status" + } ); + addAnnotation( applicableServicesEClass, + source, + new String[] { + "uniqueDataSetMemberOf", + "Tuple {\n\tmessage : String = \'For an ApplicableServices, there shall not be two DataSetMemberOf sub-elements with same cb.\',\n\tstatus : Boolean = \n\t\t\tself.dataSetMemberOf->isUnique( d : DataSetMemberOf | d.cb )\n}.status", + "uniqueService", + "Tuple {\n\tmessage : String = \'For an ApplicableServices, there shall not be two ServiceType sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.service->isUnique( s : ServiceType | s.name )\n}.status" + } ); + addAnnotation( basicTypeEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( cdcEClass, + source, + new String[] { + "uniqueCDCChild", + "Tuple {\n\tmessage : String = \'For a CDC, there shall not be two sub-elements (SubDataObject or DataAttribute) with same name.\',\n\tstatus : Boolean = \n\t\t\tlet names : Bag(String) = self.subDataObject.name->union(self.dataAttribute.name) in names->size() = names->asSet()->size()\n}.status", + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( cdCsEClass, + source, + new String[] { + "uniqueCDC", + "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two CDC sub-elements with same name and (if defined) variant.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.cDC->select( c : CDC | c.variant = null )->isUnique( c : CDC | c.name )\n\t or self.cDC->select( c : CDC | c.variant <> null )->forAll( c1, c2 : CDC | c1 <> c2 implies c1.name <> c2.name or c1.variant <> c2.variant )\n}.status" + } ); + addAnnotation( changesEClass, + source, + new String[] { + "versionAttributeRequired", + "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status" + } ); + addAnnotation( constructedAttributeEClass, + source, + new String[] { + "uniqueSubDataAttribute", + "Tuple {\n\tmessage : String = \'For a ConstructedAttribute, there shall not be two SubDataAttribute sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.subDataAttribute->isUnique( s : SubDataAttribute | s.name )\n}.status", + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( constructedAttributesEClass, + source, + new String[] { + "uniqueConstructedAttribute", + "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two ConstructedAttribute sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.constructedAttribute->isUnique( c : ConstructedAttribute | c.name )\n}.status" + } ); + addAnnotation( dataAttributeEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", + "fcAttributeRequired", + "Tuple {\n\tmessage : String = \'The fc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.fc <> null\n}.status" + } ); + addAnnotation( dataObjectEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", + "typeAttributeRequired", + "Tuple {\n\tmessage : String = \'The type attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.type <> null\n}.status" + } ); + addAnnotation( dataSetMemberOfEClass, + source, + new String[] { + "cbAttributeRequired", + "Tuple {\n\tmessage : String = \'The cb attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.cb <> null\n}.status" + } ); + addAnnotation( docEClass, + source, + new String[] { + "idAttributeRequired", + "Tuple {\n\tmessage : String = \'The id attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.id <> null\n}.status" + } ); + addAnnotation( enumerationEClass, + source, + new String[] { + "uniqueLiteralName", + "Tuple {\n\tmessage : String = \'For an Enumeration, there shall not be two Literal sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: inherited literals should be taken into account\n\t\t\t-- For this, explicit links have to be created first\n\t\t\tself.literal->isUnique( l : Literal | l.name )\n}.status", + "uniqueLiteralVal", + "Tuple {\n\tmessage : String = \'For an Enumeration, there shall not be two Literal sub-elements with same literalVal.\',\n\tstatus : Boolean = \n\t\t\tself.literal->isUnique( l : Literal | l.literalVal )\n}.status", + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( enumerationsEClass, + source, + new String[] { + "uniqueEnumeration", + "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two Enumeration sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\t-- TODO: DependsOn NS should be taken into account ?\n\t\t\t-- For this, explicit links have to be created first\n\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n\t\t\tself.enumeration->isUnique( e : Enumeration | e.name )\n}.status" + } ); + addAnnotation( functionalConstraintEClass, + source, + new String[] { + "abbreviationAttributeRequired", + "Tuple {\n\tmessage : String = \'The abbreviation attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.abbreviation <> null\n}.status" + } ); + addAnnotation( functionalConstraintsEClass, + source, + new String[] { + "uniqueFunctionalConstraint", + "Tuple {\n\tmessage : String = \'There shall not be two FunctionalConstraint elements with same abbreviation.\',\n\tstatus : Boolean = \n\t\t\tself.functionalConstraint->isUnique( f : FunctionalConstraint | f.abbreviation )\n}.status" + } ); + addAnnotation( literalEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", + "literalValAttributeRequired", + "Tuple {\n\tmessage : String = \'The literalVal attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.literalVal <> null\n}.status" + } ); + addAnnotation( lnClassEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( lnClassesEClass, + source, + new String[] { + "uniqueAbstractLNClass", + "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two AbstractLNClass sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.abstractLNClass->isUnique( c : AbstractLNClass | c.name )\n}.status", + "uniqueLNClass", + "Tuple {\n\tmessage : String = \'Within an NS, there shall not be two LNClass sub-elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.lNClass->isUnique( c : LNClass | c.name )\n}.status" + } ); + addAnnotation( nsDocEClass, + source, + new String[] { + "langAttributeRequired", + "Tuple {\n\tmessage : String = \'The lang attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.lang <> null\n}.status" + } ); + addAnnotation( presenceConditionEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( presenceConditionsEClass, + source, + new String[] { + "uniquePresenceCondition", + "Tuple {\n\tmessage : String = \'There shall not be two PresenceCondition elements with same name.\',\n\tstatus : Boolean = \n\t\t\tself.presenceCondition->isUnique( p : PresenceCondition | p.name )\n}.status" + } ); + addAnnotation( serviceCDCEClass, + source, + new String[] { + "cdcAttributeRequired", + "Tuple {\n\tmessage : String = \'The cdc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.cdc <> null\n}.status" + } ); + addAnnotation( serviceDataAttributeEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", + "fcAttributeRequired", + "Tuple {\n\tmessage : String = \'The fc attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.fc <> null\n}.status" + } ); + addAnnotation( serviceParameterEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( subDataAttributeEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status" + } ); + addAnnotation( subDataObjectEClass, + source, + new String[] { + "nameAttributeRequired", + "Tuple {\n\tmessage : String = \'The name attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.name <> null\n}.status", + "typeAttributeRequired", + "Tuple {\n\tmessage : String = \'The type attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.type <> null\n}.status" + } ); + addAnnotation( titledClassEClass, + source, + new String[] { + "titleIDAttributeRequired", + "Tuple {\n\tmessage : String = \'The titleID attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.titleID <> null\n}.status" + } ); + addAnnotation( agNSIdentificationEClass, + source, + new String[] { + "idAttributeRequired", + "Tuple {\n\tmessage : String = \'The id attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.id <> null\n}.status", + "versionAttributeRequired", + "Tuple {\n\tmessage : String = \'The version attribute is required\',\n\tstatus : Boolean = \n\t\t\tself.version <> null\n}.status" + } ); } } //NsdPackageImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java index c53468b03c6cba670f065fc07dbbb628476203b8..946285adb41170403539c250261cd158d6dad787 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionImpl.java @@ -269,8 +269,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond argument = newArgument; boolean oldArgumentESet = argumentESet; argumentESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITION__ARGUMENT, oldArgument, argument, !oldArgumentESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__ARGUMENT, + oldArgument, argument, !oldArgumentESet ) ); } /** @@ -284,8 +285,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond boolean oldArgumentESet = argumentESet; argument = ARGUMENT_EDEFAULT; argumentESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.PRESENCE_CONDITION__ARGUMENT, oldArgument, ARGUMENT_EDEFAULT, oldArgumentESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.PRESENCE_CONDITION__ARGUMENT, + oldArgument, ARGUMENT_EDEFAULT, oldArgumentESet ) ); } /** @@ -319,8 +321,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITION__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__DESC_ID, oldDescID, + descID, !oldDescIDESet ) ); } /** @@ -334,8 +337,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.PRESENCE_CONDITION__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.PRESENCE_CONDITION__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -369,8 +373,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITION__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -384,8 +389,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.PRESENCE_CONDITION__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.PRESENCE_CONDITION__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -419,8 +425,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond titleID = newTitleID; boolean oldTitleIDESet = titleIDESet; titleIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITION__TITLE_ID, oldTitleID, titleID, !oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__TITLE_ID, oldTitleID, + titleID, !oldTitleIDESet ) ); } /** @@ -434,8 +441,9 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond boolean oldTitleIDESet = titleIDESet; titleID = TITLE_ID_EDEFAULT; titleIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.PRESENCE_CONDITION__TITLE_ID, oldTitleID, TITLE_ID_EDEFAULT, oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.PRESENCE_CONDITION__TITLE_ID, + oldTitleID, TITLE_ID_EDEFAULT, oldTitleIDESet ) ); } /** @@ -484,14 +492,17 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond if( EcoreUtil.isAncestor( this, newPresenceConditions ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newPresenceConditions != null ) msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, - NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION, PresenceConditions.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newPresenceConditions != null ) + msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, + NsdPackage.PRESENCE_CONDITIONS__PRESENCE_CONDITION, PresenceConditions.class, msgs ); msgs = basicSetPresenceConditions( newPresenceConditions, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITION__PRESENCE_CONDITIONS, newPresenceConditions, newPresenceConditions ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITION__PRESENCE_CONDITIONS, + newPresenceConditions, newPresenceConditions ) ); } /** @@ -684,7 +695,8 @@ public class PresenceConditionImpl extends NsdObjectImpl implements PresenceCond public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.PRESENCE_CONDITION__PRESENCE_CONDITIONS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetPresenceConditions( ( PresenceConditions ) otherEnd, msgs ); case NsdPackage.PRESENCE_CONDITION__REFERRED_BY_DATA_OBJECT: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDataObject() ) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java index 1c286c5ed395d39ed39afee0c7170428e77bef6f..8fb273a9fa98388e49e4da00be89904ffbc9533c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/PresenceConditionsImpl.java @@ -153,14 +153,17 @@ public class PresenceConditionsImpl extends NsdObjectImpl implements PresenceCon if( EcoreUtil.isAncestor( this, newNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newNS != null ) msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, - NsdPackage.NS__PRESENCE_CONDITIONS, NS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newNS != null ) + msgs = ( ( InternalEObject ) newNS ).eInverseAdd( this, NsdPackage.NS__PRESENCE_CONDITIONS, NS.class, + msgs ); msgs = basicSetNS( newNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITIONS__NS, newNS, newNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITIONS__NS, newNS, + newNS ) ); } /** @@ -196,14 +199,17 @@ public class PresenceConditionsImpl extends NsdObjectImpl implements PresenceCon if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, + NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, + newServiceNS, newServiceNS ) ); } /** @@ -219,10 +225,12 @@ public class PresenceConditionsImpl extends NsdObjectImpl implements PresenceCon return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getPresenceCondition() ) .basicAdd( otherEnd, msgs ); case NsdPackage.PRESENCE_CONDITIONS__NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetNS( ( NS ) otherEnd, msgs ); case NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java index f12a67f1c5b8a8347d8446c3c53a8c2fddf79cf8..0ae6fc31ea4f53efe8e4679655190f6a862caa5f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCImpl.java @@ -199,8 +199,9 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { cdc = newCdc; boolean oldCdcESet = cdcESet; cdcESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CDC__CDC, oldCdc, cdc, !oldCdcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CDC__CDC, oldCdc, cdc, + !oldCdcESet ) ); } /** @@ -214,8 +215,9 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { boolean oldCdcESet = cdcESet; cdc = CDC_EDEFAULT; cdcESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_CDC__CDC, oldCdc, CDC_EDEFAULT, oldCdcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_CDC__CDC, oldCdc, CDC_EDEFAULT, + oldCdcESet ) ); } /** @@ -249,8 +251,9 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { variant = newVariant; boolean oldVariantESet = variantESet; variantESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CDC__VARIANT, oldVariant, variant, !oldVariantESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CDC__VARIANT, oldVariant, + variant, !oldVariantESet ) ); } /** @@ -264,8 +267,9 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { boolean oldVariantESet = variantESet; variant = VARIANT_EDEFAULT; variantESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_CDC__VARIANT, oldVariant, VARIANT_EDEFAULT, oldVariantESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_CDC__VARIANT, oldVariant, + VARIANT_EDEFAULT, oldVariantESet ) ); } /** @@ -311,14 +315,17 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { if( EcoreUtil.isAncestor( this, newServiceCDCs ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceCDCs != null ) msgs = ( ( InternalEObject ) newServiceCDCs ).eInverseAdd( this, - NsdPackage.SERVICE_CD_CS__SERVICE_CDC, ServiceCDCs.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceCDCs != null ) + msgs = ( ( InternalEObject ) newServiceCDCs ).eInverseAdd( this, NsdPackage.SERVICE_CD_CS__SERVICE_CDC, + ServiceCDCs.class, msgs ); msgs = basicSetServiceCDCs( newServiceCDCs, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CDC__SERVICE_CD_CS, newServiceCDCs, newServiceCDCs ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CDC__SERVICE_CD_CS, + newServiceCDCs, newServiceCDCs ) ); } /** @@ -334,7 +341,8 @@ public class ServiceCDCImpl extends NsdObjectImpl implements ServiceCDC { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getServiceDataAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.SERVICE_CDC__SERVICE_CD_CS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceCDCs( ( ServiceCDCs ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java index 50b3270a6b02ea5bda46b57501649599496bb4ab..7b764f2acc83d28b188352e742ab4c1f845cf654 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceCDCsImpl.java @@ -150,14 +150,17 @@ public class ServiceCDCsImpl extends NsdObjectImpl implements ServiceCDCs { if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__SERVICE_CD_CS, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, NsdPackage.SERVICE_NS__SERVICE_CD_CS, + ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CD_CS__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_CD_CS__SERVICE_NS, newServiceNS, + newServiceNS ) ); } /** @@ -173,7 +176,8 @@ public class ServiceCDCsImpl extends NsdObjectImpl implements ServiceCDCs { return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getServiceCDC() ).basicAdd( otherEnd, msgs ); case NsdPackage.SERVICE_CD_CS__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java index cf32dd2fa14f985d50da707aef584c6ea3872977..3424d1ed2a4945d24e1ef540089844fef3b79527 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributeImpl.java @@ -116,9 +116,10 @@ public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl im typeKindParameterized = newTypeKindParameterized; boolean oldTypeKindParameterizedESet = typeKindParameterizedESet; typeKindParameterizedESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized, - typeKindParameterized, !oldTypeKindParameterizedESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized, + typeKindParameterized, !oldTypeKindParameterizedESet ) ); } /** @@ -132,9 +133,10 @@ public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl im boolean oldTypeKindParameterizedESet = typeKindParameterizedESet; typeKindParameterized = TYPE_KIND_PARAMETERIZED_EDEFAULT; typeKindParameterizedESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized, - TYPE_KIND_PARAMETERIZED_EDEFAULT, oldTypeKindParameterizedESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__TYPE_KIND_PARAMETERIZED, oldTypeKindParameterized, + TYPE_KIND_PARAMETERIZED_EDEFAULT, oldTypeKindParameterizedESet ) ); } /** @@ -184,7 +186,8 @@ public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl im if( EcoreUtil.isAncestor( this, newServiceConstructedAttribute ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newServiceConstructedAttribute != null ) msgs = ( ( InternalEObject ) newServiceConstructedAttribute ).eInverseAdd( this, NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_CONSTRUCTED_ATTRIBUTE, @@ -192,9 +195,10 @@ public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl im msgs = basicSetServiceConstructedAttribute( newServiceConstructedAttribute, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__SERVICE_CONSTRUCTED_ATTRIBUTE, newServiceConstructedAttribute, - newServiceConstructedAttribute ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__SERVICE_CONSTRUCTED_ATTRIBUTE, + newServiceConstructedAttribute, newServiceConstructedAttribute ) ); } /** @@ -206,7 +210,8 @@ public class ServiceConstructedAttributeImpl extends ConstructedAttributeImpl im public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTE__SERVICE_CONSTRUCTED_ATTRIBUTE: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceConstructedAttribute( ( ServiceConstructedAttributes ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java index e3a69affe442b68b75509a16978f6ecf34997cba..34e1a387fa8c39a0d0c64c2c2d9c4360813c3529 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceConstructedAttributesImpl.java @@ -156,14 +156,17 @@ public class ServiceConstructedAttributesImpl extends NsdObjectImpl implements S if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, + NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_NS, newServiceNS, newServiceNS ) ); } /** @@ -179,7 +182,8 @@ public class ServiceConstructedAttributesImpl extends NsdObjectImpl implements S return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getServiceConstructedAttribute() ) .basicAdd( otherEnd, msgs ); case NsdPackage.SERVICE_CONSTRUCTED_ATTRIBUTES__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java index ea8170b71ae2d6916cd810b0bba541c8020872fa..e0d930a751ec6c2aac1532bbcf5e952b20547709 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceDataAttributeImpl.java @@ -364,8 +364,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser fc = newFc; boolean oldFcESet = fcESet; fcESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__FC, oldFc, fc, !oldFcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__FC, oldFc, fc, + !oldFcESet ) ); } /** @@ -379,8 +380,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldFcESet = fcESet; fc = FC_EDEFAULT; fcESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__FC, oldFc, FC_EDEFAULT, oldFcESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__FC, oldFc, + FC_EDEFAULT, oldFcESet ) ); } /** @@ -414,8 +416,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME, oldName, + name, !oldNameESet ) ); } /** @@ -429,8 +432,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -464,8 +468,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, + oldPresCond, presCond, !oldPresCondESet ) ); } /** @@ -479,8 +484,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND, + oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -566,9 +572,10 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser presCondArgsID = newPresCondArgsID; boolean oldPresCondArgsIDESet = presCondArgsIDESet; presCondArgsIDESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, - oldPresCondArgsID, presCondArgsID, !oldPresCondArgsIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, presCondArgsID, + !oldPresCondArgsIDESet ) ); } /** @@ -582,9 +589,10 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldPresCondArgsIDESet = presCondArgsIDESet; presCondArgsID = PRES_COND_ARGS_ID_EDEFAULT; presCondArgsIDESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, - oldPresCondArgsID, PRES_COND_ARGS_ID_EDEFAULT, oldPresCondArgsIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_DATA_ATTRIBUTE__PRES_COND_ARGS_ID, oldPresCondArgsID, PRES_COND_ARGS_ID_EDEFAULT, + oldPresCondArgsIDESet ) ); } /** @@ -618,8 +626,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE, oldType, + type, !oldTypeESet ) ); } /** @@ -633,8 +642,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -668,8 +678,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser typeKind = newTypeKind; boolean oldTypeKindESet = typeKindESet; typeKindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, + oldTypeKind, typeKind, !oldTypeKindESet ) ); } /** @@ -683,8 +694,9 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldTypeKindESet = typeKindESet; typeKind = TYPE_KIND_EDEFAULT; typeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__TYPE_KIND, + oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); } /** @@ -734,9 +746,10 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldUnderlyingTypeESet = underlyingTypeESet; underlyingType = UNDERLYING_TYPE_EDEFAULT; underlyingTypeESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, - oldUnderlyingType, UNDERLYING_TYPE_EDEFAULT, oldUnderlyingTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE, oldUnderlyingType, UNDERLYING_TYPE_EDEFAULT, + oldUnderlyingTypeESet ) ); } /** @@ -770,9 +783,10 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser underlyingTypeKind = newUnderlyingTypeKind == null ? UNDERLYING_TYPE_KIND_EDEFAULT : newUnderlyingTypeKind; boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet; underlyingTypeKindESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, - oldUnderlyingTypeKind, underlyingTypeKind, !oldUnderlyingTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind, underlyingTypeKind, + !oldUnderlyingTypeKindESet ) ); } /** @@ -786,9 +800,10 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser boolean oldUnderlyingTypeKindESet = underlyingTypeKindESet; underlyingTypeKind = UNDERLYING_TYPE_KIND_EDEFAULT; underlyingTypeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind, - UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_DATA_ATTRIBUTE__UNDERLYING_TYPE_KIND, oldUnderlyingTypeKind, + UNDERLYING_TYPE_KIND_EDEFAULT, oldUnderlyingTypeKindESet ) ); } /** @@ -836,14 +851,17 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser if( EcoreUtil.isAncestor( this, newServiceCDC ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceCDC != null ) msgs = ( ( InternalEObject ) newServiceCDC ).eInverseAdd( this, - NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE, ServiceCDC.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceCDC != null ) + msgs = ( ( InternalEObject ) newServiceCDC ).eInverseAdd( this, + NsdPackage.SERVICE_CDC__SERVICE_DATA_ATTRIBUTE, ServiceCDC.class, msgs ); msgs = basicSetServiceCDC( newServiceCDC, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_DATA_ATTRIBUTE__SERVICE_CDC, newServiceCDC, newServiceCDC ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_DATA_ATTRIBUTE__SERVICE_CDC, + newServiceCDC, newServiceCDC ) ); } /** @@ -855,7 +873,8 @@ public class ServiceDataAttributeImpl extends DocumentedClassImpl implements Ser public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SERVICE_DATA_ATTRIBUTE__SERVICE_CDC: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceCDC( ( ServiceCDC ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java index 76a23926e11a0df317319cff29da6baec3e04c6d..2fadcf465f321650d7a7e886abe812ef7204b95f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNSImpl.java @@ -495,18 +495,21 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { public void setChanges( Changes newChanges ) { if( newChanges != changes ) { NotificationChain msgs = null; - if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, - NsdPackage.CHANGES__SERVICE_NS, Changes.class, msgs ); - if( newChanges != null ) msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this, - NsdPackage.CHANGES__SERVICE_NS, Changes.class, msgs ); + if( changes != null ) + msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, NsdPackage.CHANGES__SERVICE_NS, + Changes.class, msgs ); + if( newChanges != null ) + msgs = ( ( InternalEObject ) newChanges ).eInverseAdd( this, NsdPackage.CHANGES__SERVICE_NS, + Changes.class, msgs ); msgs = basicSetChanges( newChanges, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldChangesESet = changesESet; changesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__CHANGES, newChanges, newChanges, !oldChangesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__CHANGES, newChanges, + newChanges, !oldChangesESet ) ); } } @@ -548,8 +551,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldChangesESet = changesESet; changesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__CHANGES, null, null, oldChangesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__CHANGES, null, null, + oldChangesESet ) ); } } @@ -662,8 +666,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldFunctionalConstraintsESet = functionalConstraintsESet; functionalConstraintsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, null, oldFunctionalConstraintsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, + null, null, oldFunctionalConstraintsESet ) ); } } @@ -719,10 +724,12 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { public void setPresenceConditions( PresenceConditions newPresenceConditions ) { if( newPresenceConditions != presenceConditions ) { NotificationChain msgs = null; - if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, - NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, PresenceConditions.class, msgs ); - if( newPresenceConditions != null ) msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, - NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, PresenceConditions.class, msgs ); + if( presenceConditions != null ) + msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, + NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, PresenceConditions.class, msgs ); + if( newPresenceConditions != null ) + msgs = ( ( InternalEObject ) newPresenceConditions ).eInverseAdd( this, + NsdPackage.PRESENCE_CONDITIONS__SERVICE_NS, PresenceConditions.class, msgs ); msgs = basicSetPresenceConditions( newPresenceConditions, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -774,8 +781,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldPresenceConditionsESet = presenceConditionsESet; presenceConditionsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, null, null, oldPresenceConditionsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, + null, null, oldPresenceConditionsESet ) ); } } @@ -829,18 +837,21 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { public void setAbbreviations( Abbreviations newAbbreviations ) { if( newAbbreviations != abbreviations ) { NotificationChain msgs = null; - if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, - NsdPackage.ABBREVIATIONS__SERVICE_NS, Abbreviations.class, msgs ); - if( newAbbreviations != null ) msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, - NsdPackage.ABBREVIATIONS__SERVICE_NS, Abbreviations.class, msgs ); + if( abbreviations != null ) + msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, NsdPackage.ABBREVIATIONS__SERVICE_NS, + Abbreviations.class, msgs ); + if( newAbbreviations != null ) + msgs = ( ( InternalEObject ) newAbbreviations ).eInverseAdd( this, NsdPackage.ABBREVIATIONS__SERVICE_NS, + Abbreviations.class, msgs ); msgs = basicSetAbbreviations( newAbbreviations, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldAbbreviationsESet = abbreviationsESet; abbreviationsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__ABBREVIATIONS, newAbbreviations, newAbbreviations, !oldAbbreviationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__ABBREVIATIONS, + newAbbreviations, newAbbreviations, !oldAbbreviationsESet ) ); } } @@ -882,8 +893,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldAbbreviationsESet = abbreviationsESet; abbreviationsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__ABBREVIATIONS, null, null, oldAbbreviationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__ABBREVIATIONS, null, + null, oldAbbreviationsESet ) ); } } @@ -951,9 +963,10 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldServiceTypeRealizationsESet = serviceTypeRealizationsESet; serviceTypeRealizationsESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, - newServiceTypeRealizations, newServiceTypeRealizations, !oldServiceTypeRealizationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, newServiceTypeRealizations, + newServiceTypeRealizations, !oldServiceTypeRealizationsESet ) ); } } @@ -996,8 +1009,10 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldServiceTypeRealizationsESet = serviceTypeRealizationsESet; serviceTypeRealizationsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, null, oldServiceTypeRealizationsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, null, null, + oldServiceTypeRealizationsESet ) ); } } @@ -1067,9 +1082,10 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldServiceConstructedAttributesESet = serviceConstructedAttributesESet; serviceConstructedAttributesESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, newServiceConstructedAttributes, - newServiceConstructedAttributes, !oldServiceConstructedAttributesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, newServiceConstructedAttributes, + newServiceConstructedAttributes, !oldServiceConstructedAttributesESet ) ); } } @@ -1112,9 +1128,10 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldServiceConstructedAttributesESet = serviceConstructedAttributesESet; serviceConstructedAttributesESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, null, - oldServiceConstructedAttributesESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, null, + oldServiceConstructedAttributesESet ) ); } } @@ -1168,18 +1185,21 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { public void setServiceCDCs( ServiceCDCs newServiceCDCs ) { if( newServiceCDCs != serviceCDCs ) { NotificationChain msgs = null; - if( serviceCDCs != null ) msgs = ( ( InternalEObject ) serviceCDCs ).eInverseRemove( this, - NsdPackage.SERVICE_CD_CS__SERVICE_NS, ServiceCDCs.class, msgs ); - if( newServiceCDCs != null ) msgs = ( ( InternalEObject ) newServiceCDCs ).eInverseAdd( this, - NsdPackage.SERVICE_CD_CS__SERVICE_NS, ServiceCDCs.class, msgs ); + if( serviceCDCs != null ) + msgs = ( ( InternalEObject ) serviceCDCs ).eInverseRemove( this, NsdPackage.SERVICE_CD_CS__SERVICE_NS, + ServiceCDCs.class, msgs ); + if( newServiceCDCs != null ) + msgs = ( ( InternalEObject ) newServiceCDCs ).eInverseAdd( this, NsdPackage.SERVICE_CD_CS__SERVICE_NS, + ServiceCDCs.class, msgs ); msgs = basicSetServiceCDCs( newServiceCDCs, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldServiceCDCsESet = serviceCDCsESet; serviceCDCsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__SERVICE_CD_CS, newServiceCDCs, newServiceCDCs, !oldServiceCDCsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__SERVICE_CD_CS, + newServiceCDCs, newServiceCDCs, !oldServiceCDCsESet ) ); } } @@ -1221,8 +1241,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { else { boolean oldServiceCDCsESet = serviceCDCsESet; serviceCDCsESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, null, oldServiceCDCsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, + null, oldServiceCDCsESet ) ); } } @@ -1257,8 +1278,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { descID = newDescID; boolean oldDescIDESet = descIDESet; descIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__DESC_ID, oldDescID, descID, !oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__DESC_ID, oldDescID, descID, + !oldDescIDESet ) ); } /** @@ -1272,8 +1294,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldDescIDESet = descIDESet; descID = DESC_ID_EDEFAULT; descIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__DESC_ID, oldDescID, DESC_ID_EDEFAULT, oldDescIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__DESC_ID, oldDescID, + DESC_ID_EDEFAULT, oldDescIDESet ) ); } /** @@ -1307,8 +1330,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { id = newId; boolean oldIdESet = idESet; idESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__ID, oldId, id, !oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__ID, oldId, id, + !oldIdESet ) ); } /** @@ -1322,8 +1346,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__ID, oldId, ID_EDEFAULT, + oldIdESet ) ); } /** @@ -1409,8 +1434,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__RELEASE, oldRelease, release, + !oldReleaseESet ) ); } /** @@ -1424,8 +1450,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -1459,8 +1486,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__REVISION, oldRevision, + revision, !oldRevisionESet ) ); } /** @@ -1474,8 +1502,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__REVISION, oldRevision, + REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -1509,8 +1538,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { umlDate = newUmlDate; boolean oldUmlDateESet = umlDateESet; umlDateESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__UML_DATE, oldUmlDate, umlDate, !oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__UML_DATE, oldUmlDate, + umlDate, !oldUmlDateESet ) ); } /** @@ -1524,8 +1554,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldUmlDateESet = umlDateESet; umlDate = UML_DATE_EDEFAULT; umlDateESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__UML_DATE, oldUmlDate, UML_DATE_EDEFAULT, oldUmlDateESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__UML_DATE, oldUmlDate, + UML_DATE_EDEFAULT, oldUmlDateESet ) ); } /** @@ -1559,8 +1590,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { umlVersion = newUmlVersion; boolean oldUmlVersionESet = umlVersionESet; umlVersionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__UML_VERSION, oldUmlVersion, umlVersion, !oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__UML_VERSION, oldUmlVersion, + umlVersion, !oldUmlVersionESet ) ); } /** @@ -1574,8 +1606,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldUmlVersionESet = umlVersionESet; umlVersion = UML_VERSION_EDEFAULT; umlVersionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__UML_VERSION, oldUmlVersion, UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__UML_VERSION, oldUmlVersion, + UML_VERSION_EDEFAULT, oldUmlVersionESet ) ); } /** @@ -1597,8 +1630,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SERVICE_NS__CHANGES: - if( changes != null ) msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__CHANGES, null, msgs ); + if( changes != null ) + msgs = ( ( InternalEObject ) changes ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__CHANGES, null, msgs ); return basicSetChanges( ( Changes ) otherEnd, msgs ); case NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS: if( functionalConstraints != null ) @@ -1606,12 +1640,14 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__FUNCTIONAL_CONSTRAINTS, null, msgs ); return basicSetFunctionalConstraints( ( FunctionalConstraints ) otherEnd, msgs ); case NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS: - if( presenceConditions != null ) msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, null, msgs ); + if( presenceConditions != null ) + msgs = ( ( InternalEObject ) presenceConditions ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__PRESENCE_CONDITIONS, null, msgs ); return basicSetPresenceConditions( ( PresenceConditions ) otherEnd, msgs ); case NsdPackage.SERVICE_NS__ABBREVIATIONS: - if( abbreviations != null ) msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__ABBREVIATIONS, null, msgs ); + if( abbreviations != null ) + msgs = ( ( InternalEObject ) abbreviations ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__ABBREVIATIONS, null, msgs ); return basicSetAbbreviations( ( Abbreviations ) otherEnd, msgs ); case NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS: if( serviceTypeRealizations != null ) @@ -1624,8 +1660,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CONSTRUCTED_ATTRIBUTES, null, msgs ); return basicSetServiceConstructedAttributes( ( ServiceConstructedAttributes ) otherEnd, msgs ); case NsdPackage.SERVICE_NS__SERVICE_CD_CS: - if( serviceCDCs != null ) msgs = ( ( InternalEObject ) serviceCDCs ).eInverseRemove( this, - EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, msgs ); + if( serviceCDCs != null ) + msgs = ( ( InternalEObject ) serviceCDCs ).eInverseRemove( this, + EOPPOSITE_FEATURE_BASE - NsdPackage.SERVICE_NS__SERVICE_CD_CS, null, msgs ); return basicSetServiceCDCs( ( ServiceCDCs ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); @@ -1652,8 +1689,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS__VERSION, oldVersion, version, + !oldVersionESet ) ); } /** @@ -1667,8 +1705,9 @@ public class ServiceNSImpl extends CopyrightedImpl implements ServiceNS { boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java index 281c51a77d99b6726a867ec83124e5fe16106b29..6f29b600e113a73bb985eabf741142ce1cc5b536 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceNsUsageImpl.java @@ -256,8 +256,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage release = newRelease; boolean oldReleaseESet = releaseESet; releaseESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS_USAGE__RELEASE, oldRelease, release, !oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__RELEASE, oldRelease, + release, !oldReleaseESet ) ); } /** @@ -271,8 +272,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage boolean oldReleaseESet = releaseESet; release = RELEASE_EDEFAULT; releaseESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS_USAGE__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS_USAGE__RELEASE, oldRelease, + RELEASE_EDEFAULT, oldReleaseESet ) ); } /** @@ -306,8 +308,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage version = newVersion; boolean oldVersionESet = versionESet; versionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS_USAGE__VERSION, oldVersion, version, !oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__VERSION, oldVersion, + version, !oldVersionESet ) ); } /** @@ -321,8 +324,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage boolean oldVersionESet = versionESet; version = VERSION_EDEFAULT; versionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS_USAGE__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS_USAGE__VERSION, oldVersion, + VERSION_EDEFAULT, oldVersionESet ) ); } /** @@ -390,8 +394,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage id = newId; boolean oldIdESet = idESet; idESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS_USAGE__ID, oldId, id, !oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__ID, oldId, id, + !oldIdESet ) ); } /** @@ -405,8 +410,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage boolean oldIdESet = idESet; id = ID_EDEFAULT; idESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS_USAGE__ID, oldId, ID_EDEFAULT, oldIdESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS_USAGE__ID, oldId, + ID_EDEFAULT, oldIdESet ) ); } /** @@ -492,8 +498,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage revision = newRevision; boolean oldRevisionESet = revisionESet; revisionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS_USAGE__REVISION, oldRevision, revision, !oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__REVISION, oldRevision, + revision, !oldRevisionESet ) ); } /** @@ -507,8 +514,9 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage boolean oldRevisionESet = revisionESet; revision = REVISION_EDEFAULT; revisionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_NS_USAGE__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_NS_USAGE__REVISION, + oldRevision, REVISION_EDEFAULT, oldRevisionESet ) ); } /** @@ -557,15 +565,17 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage if( EcoreUtil.isAncestor( this, newApplicableServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newApplicableServiceNS != null ) msgs = ( ( InternalEObject ) newApplicableServiceNS ).eInverseAdd( this, NsdPackage.APPLICABLE_SERVICE_NS__SERVICE_NS_USAGE, ApplicableServiceNS.class, msgs ); msgs = basicSetApplicableServiceNS( newApplicableServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_NS_USAGE__APPLICABLE_SERVICE_NS, newApplicableServiceNS, newApplicableServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_NS_USAGE__APPLICABLE_SERVICE_NS, + newApplicableServiceNS, newApplicableServiceNS ) ); } /** @@ -581,7 +591,8 @@ public class ServiceNsUsageImpl extends NsdObjectImpl implements ServiceNsUsage return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getAppliesTo() ).basicAdd( otherEnd, msgs ); case NsdPackage.SERVICE_NS_USAGE__APPLICABLE_SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetApplicableServiceNS( ( ApplicableServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java index 679dd54123eb528f9ef20b5e5c0e7499e36803d4..97287d74d30968070cac873e5b03ac70a3e798a3 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceParameterImpl.java @@ -274,8 +274,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service defaultValue = newDefaultValue; boolean oldDefaultValueESet = defaultValueESet; defaultValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE, oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__DEFAULT_VALUE, + oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); } /** @@ -325,8 +326,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service maxValue = newMaxValue; boolean oldMaxValueESet = maxValueESet; maxValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__MAX_VALUE, oldMaxValue, maxValue, !oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__MAX_VALUE, + oldMaxValue, maxValue, !oldMaxValueESet ) ); } /** @@ -340,8 +342,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service boolean oldMaxValueESet = maxValueESet; maxValue = MAX_VALUE_EDEFAULT; maxValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_PARAMETER__MAX_VALUE, oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_PARAMETER__MAX_VALUE, + oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); } /** @@ -375,8 +378,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service minValue = newMinValue; boolean oldMinValueESet = minValueESet; minValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__MIN_VALUE, oldMinValue, minValue, !oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__MIN_VALUE, + oldMinValue, minValue, !oldMinValueESet ) ); } /** @@ -390,8 +394,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service boolean oldMinValueESet = minValueESet; minValue = MIN_VALUE_EDEFAULT; minValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_PARAMETER__MIN_VALUE, oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_PARAMETER__MIN_VALUE, + oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); } /** @@ -425,8 +430,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -440,8 +446,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_PARAMETER__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_PARAMETER__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -475,8 +482,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -490,8 +498,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_PARAMETER__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_PARAMETER__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -525,8 +534,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service typeKind = newTypeKind; boolean oldTypeKindESet = typeKindESet; typeKindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_PARAMETER__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__TYPE_KIND, + oldTypeKind, typeKind, !oldTypeKindESet ) ); } /** @@ -540,8 +550,9 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service boolean oldTypeKindESet = typeKindESet; typeKind = TYPE_KIND_EDEFAULT; typeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_PARAMETER__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_PARAMETER__TYPE_KIND, + oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); } /** @@ -587,14 +598,17 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service if( EcoreUtil.isAncestor( this, newCDC ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCDC != null ) msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, - NsdPackage.CDC__SERVICE_PARAMETER, CDC.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCDC != null ) + msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, NsdPackage.CDC__SERVICE_PARAMETER, CDC.class, + msgs ); msgs = basicSetCDC( newCDC, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__CDC, newCDC, newCDC ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_PARAMETER__CDC, newCDC, + newCDC ) ); } /** @@ -606,7 +620,8 @@ public class ServiceParameterImpl extends DocumentedClassImpl implements Service public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SERVICE_PARAMETER__CDC: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCDC( ( CDC ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java index 2e96bbb074d2743243105340ea86084fc16471b4..15acce3868b80556c120d131ebd52adf2c87fbca 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeImpl.java @@ -117,8 +117,9 @@ public class ServiceTypeImpl extends NsdObjectImpl implements ServiceType { name = newName == null ? NAME_EDEFAULT : newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_TYPE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_TYPE__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -132,8 +133,9 @@ public class ServiceTypeImpl extends NsdObjectImpl implements ServiceType { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SERVICE_TYPE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SERVICE_TYPE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -182,14 +184,17 @@ public class ServiceTypeImpl extends NsdObjectImpl implements ServiceType { if( EcoreUtil.isAncestor( this, newApplicableServices ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newApplicableServices != null ) msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, - NsdPackage.APPLICABLE_SERVICES__SERVICE, ApplicableServices.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newApplicableServices != null ) + msgs = ( ( InternalEObject ) newApplicableServices ).eInverseAdd( this, + NsdPackage.APPLICABLE_SERVICES__SERVICE, ApplicableServices.class, msgs ); msgs = basicSetApplicableServices( newApplicableServices, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_TYPE__APPLICABLE_SERVICES, newApplicableServices, newApplicableServices ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_TYPE__APPLICABLE_SERVICES, + newApplicableServices, newApplicableServices ) ); } /** @@ -201,7 +206,8 @@ public class ServiceTypeImpl extends NsdObjectImpl implements ServiceType { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SERVICE_TYPE__APPLICABLE_SERVICES: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetApplicableServices( ( ApplicableServices ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java index 519c4015dd84038efb8cf36eb8bb028bf7db7029..2e072a5e10821eec2c476fb0f627bfbea9b634a2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/ServiceTypeRealizationsImpl.java @@ -153,14 +153,17 @@ public class ServiceTypeRealizationsImpl extends NsdObjectImpl implements Servic if( EcoreUtil.isAncestor( this, newServiceNS ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newServiceNS != null ) msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, - NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, ServiceNS.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newServiceNS != null ) + msgs = ( ( InternalEObject ) newServiceNS ).eInverseAdd( this, + NsdPackage.SERVICE_NS__SERVICE_TYPE_REALIZATIONS, ServiceNS.class, msgs ); msgs = basicSetServiceNS( newServiceNS, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_NS, newServiceNS, newServiceNS ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_NS, + newServiceNS, newServiceNS ) ); } /** @@ -176,7 +179,8 @@ public class ServiceTypeRealizationsImpl extends NsdObjectImpl implements Servic return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getServiceTypeRealization() ) .basicAdd( otherEnd, msgs ); case NsdPackage.SERVICE_TYPE_REALIZATIONS__SERVICE_NS: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetServiceNS( ( ServiceNS ) otherEnd, msgs ); } return super.eInverseAdd( otherEnd, featureID, msgs ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java index a46aef8341d4cbfe081340e77154cb891e8fe02d..209edbd22d2b629ce30b4aa2f5d22ab61d3def49 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java @@ -24,6 +24,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgAttributeType; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgAttributeTypeAndValues; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgPresenceCondition; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.ConstructedAttribute; +import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdFactory; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition; @@ -508,8 +509,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData defaultValue = newDefaultValue; boolean oldDefaultValueESet = defaultValueESet; defaultValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE, oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__DEFAULT_VALUE, + oldDefaultValue, defaultValue, !oldDefaultValueESet ) ); } /** @@ -559,8 +561,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData isArray = newIsArray; boolean oldIsArrayESet = isArrayESet; isArrayESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, + isArray, !oldIsArrayESet ) ); } /** @@ -574,8 +577,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldIsArrayESet = isArrayESet; isArray = IS_ARRAY_EDEFAULT; isArrayESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__IS_ARRAY, + oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); } /** @@ -625,9 +629,10 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldMaxIndexAttributeESet = maxIndexAttributeESet; maxIndexAttribute = MAX_INDEX_ATTRIBUTE_EDEFAULT; maxIndexAttributeESet = false; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, - oldMaxIndexAttribute, MAX_INDEX_ATTRIBUTE_EDEFAULT, oldMaxIndexAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SUB_DATA_ATTRIBUTE__MAX_INDEX_ATTRIBUTE, oldMaxIndexAttribute, + MAX_INDEX_ATTRIBUTE_EDEFAULT, oldMaxIndexAttributeESet ) ); } /** @@ -661,8 +666,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData maxValue = newMaxValue; boolean oldMaxValueESet = maxValueESet; maxValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, maxValue, !oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE, + oldMaxValue, maxValue, !oldMaxValueESet ) ); } /** @@ -676,8 +682,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldMaxValueESet = maxValueESet; maxValue = MAX_VALUE_EDEFAULT; maxValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE, oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__MAX_VALUE, + oldMaxValue, MAX_VALUE_EDEFAULT, oldMaxValueESet ) ); } /** @@ -711,8 +718,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData minIndex = newMinIndex; boolean oldMinIndexESet = minIndexESet; minIndexESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, + oldMinIndex, minIndex, !oldMinIndexESet ) ); } /** @@ -726,8 +734,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldMinIndexESet = minIndexESet; minIndex = MIN_INDEX_EDEFAULT; minIndexESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__MIN_INDEX, + oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); } /** @@ -761,8 +770,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData minValue = newMinValue; boolean oldMinValueESet = minValueESet; minValueESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, minValue, !oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE, + oldMinValue, minValue, !oldMinValueESet ) ); } /** @@ -776,8 +786,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldMinValueESet = minValueESet; minValue = MIN_VALUE_EDEFAULT; minValueESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE, oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__MIN_VALUE, + oldMinValue, MIN_VALUE_EDEFAULT, oldMinValueESet ) ); } /** @@ -811,8 +822,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -826,8 +838,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -861,8 +874,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, + oldPresCond, presCond, !oldPresCondESet ) ); } /** @@ -876,8 +890,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND, + oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -911,8 +926,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData presCondArgs = newPresCondArgs; boolean oldPresCondArgsESet = presCondArgsESet; presCondArgsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS, oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__PRES_COND_ARGS, + oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); } /** @@ -1066,8 +1082,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -1081,8 +1098,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -1116,8 +1134,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData typeKind = newTypeKind; boolean oldTypeKindESet = typeKindESet; typeKindESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, typeKind, !oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, + oldTypeKind, typeKind, !oldTypeKindESet ) ); } /** @@ -1131,8 +1150,9 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData boolean oldTypeKindESet = typeKindESet; typeKind = TYPE_KIND_EDEFAULT; typeKindESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_ATTRIBUTE__TYPE_KIND, + oldTypeKind, TYPE_KIND_EDEFAULT, oldTypeKindESet ) ); } /** @@ -1181,16 +1201,18 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData if( EcoreUtil.isAncestor( this, newConstructedAttribute ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); if( newConstructedAttribute != null ) msgs = ( ( InternalEObject ) newConstructedAttribute ).eInverseAdd( this, NsdPackage.CONSTRUCTED_ATTRIBUTE__SUB_DATA_ATTRIBUTE, ConstructedAttribute.class, msgs ); msgs = basicSetConstructedAttribute( newConstructedAttribute, msgs ); if( msgs != null ) msgs.dispatch(); } - else if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_ATTRIBUTE__CONSTRUCTED_ATTRIBUTE, - newConstructedAttribute, newConstructedAttribute ) ); + else if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SUB_DATA_ATTRIBUTE__CONSTRUCTED_ATTRIBUTE, newConstructedAttribute, + newConstructedAttribute ) ); } /** @@ -1247,9 +1269,10 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, - newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, + newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); } } @@ -1292,9 +1315,10 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, null, null, - oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION, null, null, + oldRefersToPresenceConditionESet ) ); } } @@ -1317,7 +1341,8 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SUB_DATA_ATTRIBUTE__CONSTRUCTED_ATTRIBUTE: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetConstructedAttribute( ( ConstructedAttribute ) otherEnd, msgs ); case NsdPackage.SUB_DATA_ATTRIBUTE__REFERS_TO_PRESENCE_CONDITION: if( refersToPresenceCondition != null ) @@ -1761,18 +1786,17 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; + NS ns = getConstructedAttribute().getConstructedAttributes().getNS(); if( isSetPresCond() ) { - setRefersToPresenceCondition( getConstructedAttribute().getConstructedAttributes().getNS() - .findPresenceCondition( getPresCond(), console ) ); - if( getRefersToPresenceCondition() == null ) { + PresenceCondition foundPC = ns.findPresenceCondition( getPresCond(), console ); + if( foundPC == null ) { console.error( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataAttribute (name: " - + getName() + ") in NS (id:" - + getConstructedAttribute().getConstructedAttributes().getNS().getId() + ") is unknown" ); + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToPresenceCondition( foundPC ); console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataAttribute (name: " - + getName() + ") in NS (id:" - + getConstructedAttribute().getConstructedAttributes().getNS().getId() + ") found in NS (id:" + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java index ec0402d12ea7de7726911cb7d14c06962fea9488..6a03845b28317cff151b9eae358064c4c237aa67 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java @@ -25,6 +25,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUnderlyingType; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.CDC; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataAttribute; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DefinedAttributeTypeKind; +import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.SubDataObject; @@ -503,8 +504,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj isArray = newIsArray; boolean oldIsArrayESet = isArrayESet; isArrayESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, isArray, !oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, + isArray, !oldIsArrayESet ) ); } /** @@ -518,8 +520,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj boolean oldIsArrayESet = isArrayESet; isArray = IS_ARRAY_EDEFAULT; isArrayESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__IS_ARRAY, oldIsArray, + IS_ARRAY_EDEFAULT, oldIsArrayESet ) ); } /** @@ -605,8 +608,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj minIndex = newMinIndex; boolean oldMinIndexESet = minIndexESet; minIndexESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, minIndex, !oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, + minIndex, !oldMinIndexESet ) ); } /** @@ -620,8 +624,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj boolean oldMinIndexESet = minIndexESet; minIndex = MIN_INDEX_EDEFAULT; minIndexESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__MIN_INDEX, + oldMinIndex, MIN_INDEX_EDEFAULT, oldMinIndexESet ) ); } /** @@ -655,8 +660,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__NAME, oldName, name, !oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__NAME, oldName, name, + !oldNameESet ) ); } /** @@ -670,8 +676,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__NAME, oldName, + NAME_EDEFAULT, oldNameESet ) ); } /** @@ -705,8 +712,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj presCond = newPresCond; boolean oldPresCondESet = presCondESet; presCondESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__PRES_COND, oldPresCond, presCond, !oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__PRES_COND, oldPresCond, + presCond, !oldPresCondESet ) ); } /** @@ -720,8 +728,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj boolean oldPresCondESet = presCondESet; presCond = PRES_COND_EDEFAULT; presCondESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__PRES_COND, oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__PRES_COND, + oldPresCond, PRES_COND_EDEFAULT, oldPresCondESet ) ); } /** @@ -755,8 +764,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj presCondArgs = newPresCondArgs; boolean oldPresCondArgsESet = presCondArgsESet; presCondArgsESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS, oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__PRES_COND_ARGS, + oldPresCondArgs, presCondArgs, !oldPresCondArgsESet ) ); } /** @@ -858,8 +868,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj sizeAttribute = newSizeAttribute; boolean oldSizeAttributeESet = sizeAttributeESet; sizeAttributeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE, oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__SIZE_ATTRIBUTE, + oldSizeAttribute, sizeAttribute, !oldSizeAttributeESet ) ); } /** @@ -909,8 +920,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__TYPE, oldType, type, !oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__TYPE, oldType, type, + !oldTypeESet ) ); } /** @@ -924,8 +936,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__TYPE, oldType, + TYPE_EDEFAULT, oldTypeESet ) ); } /** @@ -1075,9 +1088,11 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj if( EcoreUtil.isAncestor( this, newCDC ) ) throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); NotificationChain msgs = null; - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); - if( newCDC != null ) msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, - NsdPackage.CDC__SUB_DATA_OBJECT, CDC.class, msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); + if( newCDC != null ) + msgs = ( ( InternalEObject ) newCDC ).eInverseAdd( this, NsdPackage.CDC__SUB_DATA_OBJECT, CDC.class, + msgs ); msgs = basicSetCDC( newCDC, msgs ); if( msgs != null ) msgs.dispatch(); } @@ -1125,18 +1140,21 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj public void setRefersToCDC( CDC newRefersToCDC ) { if( newRefersToCDC != refersToCDC ) { NotificationChain msgs = null; - if( refersToCDC != null ) msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, - NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); - if( newRefersToCDC != null ) msgs = ( ( InternalEObject ) newRefersToCDC ).eInverseAdd( this, - NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); + if( refersToCDC != null ) + msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, + NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); + if( newRefersToCDC != null ) + msgs = ( ( InternalEObject ) newRefersToCDC ).eInverseAdd( this, + NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); msgs = basicSetRefersToCDC( newRefersToCDC, msgs ); if( msgs != null ) msgs.dispatch(); } else { boolean oldRefersToCDCESet = refersToCDCESet; refersToCDCESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_CDC, newRefersToCDC, newRefersToCDC, !oldRefersToCDCESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__REFERS_TO_CDC, + newRefersToCDC, newRefersToCDC, !oldRefersToCDCESet ) ); } } @@ -1178,8 +1196,9 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToCDCESet = refersToCDCESet; refersToCDCESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_CDC, null, null, oldRefersToCDCESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.SUB_DATA_OBJECT__REFERS_TO_CDC, + null, null, oldRefersToCDCESet ) ); } } @@ -1247,9 +1266,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, - newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, newRefersToPresenceCondition, + newRefersToPresenceCondition, !oldRefersToPresenceConditionESet ) ); } } @@ -1292,9 +1312,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToPresenceConditionESet = refersToPresenceConditionESet; refersToPresenceConditionESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, null, null, - oldRefersToPresenceConditionESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION, null, null, + oldRefersToPresenceConditionESet ) ); } } @@ -1364,9 +1385,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToSizeAttributeESet = refersToSizeAttributeESet; refersToSizeAttributeESet = true; - if( eNotificationRequired() ) eNotify( - new ENotificationImpl( this, Notification.SET, NsdPackage.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, - newRefersToSizeAttribute, newRefersToSizeAttribute, !oldRefersToSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, newRefersToSizeAttribute, + newRefersToSizeAttribute, !oldRefersToSizeAttributeESet ) ); } } @@ -1410,8 +1432,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToSizeAttributeESet = refersToSizeAttributeESet; refersToSizeAttributeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, null, null, oldRefersToSizeAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_SIZE_ATTRIBUTE, null, null, + oldRefersToSizeAttributeESet ) ); } } @@ -1481,9 +1505,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToMaxIndexAttributeESet = refersToMaxIndexAttributeESet; refersToMaxIndexAttributeESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, newRefersToMaxIndexAttribute, - newRefersToMaxIndexAttribute, !oldRefersToMaxIndexAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, newRefersToMaxIndexAttribute, + newRefersToMaxIndexAttribute, !oldRefersToMaxIndexAttributeESet ) ); } } @@ -1527,9 +1552,10 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj else { boolean oldRefersToMaxIndexAttributeESet = refersToMaxIndexAttributeESet; refersToMaxIndexAttributeESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, null, null, - oldRefersToMaxIndexAttributeESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, + NsdPackage.SUB_DATA_OBJECT__REFERS_TO_MAX_INDEX_ATTRIBUTE, null, null, + oldRefersToMaxIndexAttributeESet ) ); } } @@ -1552,11 +1578,13 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case NsdPackage.SUB_DATA_OBJECT__CDC: - if( eInternalContainer() != null ) msgs = eBasicRemoveFromContainer( msgs ); + if( eInternalContainer() != null ) + msgs = eBasicRemoveFromContainer( msgs ); return basicSetCDC( ( CDC ) otherEnd, msgs ); case NsdPackage.SUB_DATA_OBJECT__REFERS_TO_CDC: - if( refersToCDC != null ) msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, - NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); + if( refersToCDC != null ) + msgs = ( ( InternalEObject ) refersToCDC ).eInverseRemove( this, + NsdPackage.CDC__REFERRED_BY_SUB_DATA_OBJECT, CDC.class, msgs ); return basicSetRefersToCDC( ( CDC ) otherEnd, msgs ); case NsdPackage.SUB_DATA_OBJECT__REFERS_TO_PRESENCE_CONDITION: if( refersToPresenceCondition != null ) @@ -1994,59 +2022,75 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj public boolean buildExplicitLinks( IRiseClipseConsole console ) { if( super.buildExplicitLinks( console ) ) return true; + NS ns = getCDC().getCDCs().getNS(); if( isSetType() ) { - setRefersToCDC( getCDC().getCDCs().getNS().findCDC( getType(), console ) ); - if( getRefersToCDC() == null ) { - console.error( "CDC (name: " + getType() + ") refers by SubDataObject (name: " + getName() - + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + CDC foundCDC = ns.findCDC( getType(), console ); + + if( foundCDC == null ) { + console.error( + "CDC (name: " + getType() + ") refers by SubDataObject (name: " + getName() + ") in NS (id:" + + ns.getId() + ") is unknown" ); } else { + setRefersToCDC( foundCDC ); console.verbose( "CDC (name: " + getType() + ") refers by SubDataObject (name: " + getName() - + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToCDC().getCDCs().getNS().getId() + ")" ); } } if( isSetPresCond() ) { - setRefersToPresenceCondition( getCDC().getCDCs().getNS().findPresenceCondition( getPresCond(), console ) ); - if( getRefersToPresenceCondition() == null ) { + PresenceCondition foundPC = ns.findPresenceCondition( getPresCond(), console ); + + if( foundPC == null ) { console.error( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataObject (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + getName() + ") in NS (id:" + ns.getId() + ") is unknown" ); } else { + setRefersToPresenceCondition( foundPC ); console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataObject (name: " - + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + + getName() + ") in NS (id:" + ns.getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } } if( isSetSizeAttribute() ) { - setRefersToSizeAttribute( getCDC().getDataAttribute().stream() - .filter( att -> att.getName().equals( getSizeAttribute() ) ).findAny().orElse( null ) ); - if( getRefersToSizeAttribute() == null ) { - console.error( "DataAttribute (name: " + getSizeAttribute() + getCDC() + .getDataAttribute() + .stream() + .filter( att -> att.getName().equals( getSizeAttribute() ) ) + .findAny() + .ifPresent( att -> setRefersToSizeAttribute( att ) ); + + if( isSetRefersToSizeAttribute() ) { + console.verbose( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by SubDataObject (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + ns.getId() + ") found" ); } else { - console.verbose( "DataAttribute (name: " + getSizeAttribute() + console.error( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by SubDataObject (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") found" ); + + ns.getId() + ") is unknown" ); } } if( isSetMaxIndexAttribute() ) { - setRefersToMaxIndexAttribute( getCDC().getDataAttribute().stream() - .filter( att -> att.getName().equals( getMaxIndexAttribute() ) ).findAny().orElse( null ) ); - if( getRefersToMaxIndexAttribute() == null ) { - console.error( "DataAttribute (name: " + getMaxIndexAttribute() + getCDC() + .getDataAttribute() + .stream() + .filter( att -> att.getName().equals( getSizeAttribute() ) ) + .findAny() + .ifPresent( att -> setRefersToMaxIndexAttribute( att ) ); + + if( isSetRefersToMaxIndexAttribute() ) { + console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by SubDataObject (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") is unknown" ); + + ns.getId() + ") found" ); } else { - console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + console.error( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by SubDataObject (name: " + getName() + ") in NS (id:" - + getCDC().getCDCs().getNS().getId() + ") found" ); + + ns.getId() + ") is unknown" ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java index 122510da9b90cb3330bf3a85eba17e50ef9a44c8..071f7b7090e92a8b19ef2c54a67f7438238ba02c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/TitledClassImpl.java @@ -111,8 +111,9 @@ public class TitledClassImpl extends DocumentedClassImpl implements TitledClass titleID = newTitleID; boolean oldTitleIDESet = titleIDESet; titleIDESet = true; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.SET, - NsdPackage.TITLED_CLASS__TITLE_ID, oldTitleID, titleID, !oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, NsdPackage.TITLED_CLASS__TITLE_ID, oldTitleID, + titleID, !oldTitleIDESet ) ); } /** @@ -126,8 +127,9 @@ public class TitledClassImpl extends DocumentedClassImpl implements TitledClass boolean oldTitleIDESet = titleIDESet; titleID = TITLE_ID_EDEFAULT; titleIDESet = false; - if( eNotificationRequired() ) eNotify( new ENotificationImpl( this, Notification.UNSET, - NsdPackage.TITLED_CLASS__TITLE_ID, oldTitleID, TITLE_ID_EDEFAULT, oldTitleIDESet ) ); + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.UNSET, NsdPackage.TITLED_CLASS__TITLE_ID, oldTitleID, + TITLE_ID_EDEFAULT, oldTitleIDESet ) ); } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java index 1010349c0deac20482d308abfe8cadfb8fe2f4ad..36bd994c3be64354218db229ba050c226209382d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdValidator.java @@ -357,9 +357,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SERVICE_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String SERVICE_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Service Type</em>'. @@ -369,9 +371,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateServiceType_nameAttributeRequired( ServiceType serviceType, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SERVICE_TYPE, serviceType, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - SERVICE_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SERVICE_TYPE, + serviceType, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + SERVICE_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -405,9 +414,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ABBREVIATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String ABBREVIATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Abbreviation</em>'. @@ -417,9 +428,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAbbreviation_nameAttributeRequired( Abbreviation abbreviation, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ABBREVIATION, abbreviation, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - ABBREVIATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ABBREVIATION, + abbreviation, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + ABBREVIATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -454,10 +472,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ABBREVIATIONS__UNIQUE_ABBREVIATION__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'There shall not be two Abbreviations elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.abbreviation->isUnique( a : Abbreviation | a.name )\n" - + "}.status"; + protected static final String ABBREVIATIONS__UNIQUE_ABBREVIATION__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'There shall not be two Abbreviations elements with same name.',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.abbreviation->isUnique( a : Abbreviation | a.name )\n" + + "}.status"; /** * Validates the uniqueAbbreviation constraint of '<em>Abbreviations</em>'. @@ -467,9 +486,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAbbreviations_uniqueAbbreviation( Abbreviations abbreviations, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ABBREVIATIONS, abbreviations, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueAbbreviation", - ABBREVIATIONS__UNIQUE_ABBREVIATION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ABBREVIATIONS, + abbreviations, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueAbbreviation", + ABBREVIATIONS__UNIQUE_ABBREVIATION__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -508,9 +534,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ABSTRACT_LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String ABSTRACT_LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Abstract LN Class</em>'. @@ -520,9 +548,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAbstractLNClass_nameAttributeRequired( AbstractLNClass abstractLNClass, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ABSTRACT_LN_CLASS, abstractLNClass, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - ABSTRACT_LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ABSTRACT_LN_CLASS, + abstractLNClass, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + ABSTRACT_LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -557,11 +592,14 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ANY_LN_CLASS__UNIQUE_DATA_OBJECT__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For an AnyLNClass, there shall not be two DataObject sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\t-- TODO: base AbstractLNClass should be taken into account\n" - + "\t\t\t-- For this, explicit links have to be created first\n" - + "\t\t\tself.dataObject->isUnique( d : DataObject | d.name )\n" + "}.status"; + protected static final String ANY_LN_CLASS__UNIQUE_DATA_OBJECT__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For an AnyLNClass, there shall not be two DataObject sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\t-- TODO: base AbstractLNClass should be taken into account\n" + + "\t\t\t-- For this, explicit links have to be created first\n" + + "\t\t\tself.dataObject->isUnique( d : DataObject | d.name )\n" + + "}.status"; /** * Validates the uniqueDataObject constraint of '<em>Any LN Class</em>'. @@ -571,9 +609,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAnyLNClass_uniqueDataObject( AnyLNClass anyLNClass, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ANY_LN_CLASS, anyLNClass, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueDataObject", - ANY_LN_CLASS__UNIQUE_DATA_OBJECT__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ANY_LN_CLASS, + anyLNClass, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueDataObject", + ANY_LN_CLASS__UNIQUE_DATA_OBJECT__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -611,9 +656,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String APPLICABLE_SERVICE_NS__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The version attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.version <> null\n" + "}.status"; + protected static final String APPLICABLE_SERVICE_NS__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The version attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.version <> null\n" + + "}.status"; /** * Validates the versionAttributeRequired constraint of '<em>Applicable Service NS</em>'. @@ -623,9 +670,15 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateApplicableServiceNS_versionAttributeRequired( ApplicableServiceNS applicableServiceNS, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.APPLICABLE_SERVICE_NS, applicableServiceNS, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "versionAttributeRequired", - APPLICABLE_SERVICE_NS__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, + return validate( NsdPackage.Literals.APPLICABLE_SERVICE_NS, + applicableServiceNS, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "versionAttributeRequired", + APPLICABLE_SERVICE_NS__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, 0 ); } @@ -635,9 +688,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String APPLICABLE_SERVICE_NS__DATE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The date attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.date <> null\n" + "}.status"; + protected static final String APPLICABLE_SERVICE_NS__DATE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The date attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.date <> null\n" + + "}.status"; /** * Validates the dateAttributeRequired constraint of '<em>Applicable Service NS</em>'. @@ -647,9 +702,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateApplicableServiceNS_dateAttributeRequired( ApplicableServiceNS applicableServiceNS, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.APPLICABLE_SERVICE_NS, applicableServiceNS, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "dateAttributeRequired", - APPLICABLE_SERVICE_NS__DATE_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.APPLICABLE_SERVICE_NS, + applicableServiceNS, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "dateAttributeRequired", + APPLICABLE_SERVICE_NS__DATE_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -687,10 +749,12 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String APPLICABLE_SERVICES__UNIQUE_DATA_SET_MEMBER_OF__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For an ApplicableServices, there shall not be two DataSetMemberOf sub-elements with same cb.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.dataSetMemberOf->isUnique( d : DataSetMemberOf | d.cb )\n" - + "}.status"; + protected static final String APPLICABLE_SERVICES__UNIQUE_DATA_SET_MEMBER_OF__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For an ApplicableServices, there shall not be two DataSetMemberOf sub-elements with same cb.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tself.dataSetMemberOf->isUnique( d : DataSetMemberOf | d.cb )\n" + + "}.status"; /** * Validates the uniqueDataSetMemberOf constraint of '<em>Applicable Services</em>'. @@ -700,9 +764,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateApplicableServices_uniqueDataSetMemberOf( ApplicableServices applicableServices, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.APPLICABLE_SERVICES, applicableServices, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueDataSetMemberOf", - APPLICABLE_SERVICES__UNIQUE_DATA_SET_MEMBER_OF__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.APPLICABLE_SERVICES, + applicableServices, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueDataSetMemberOf", + APPLICABLE_SERVICES__UNIQUE_DATA_SET_MEMBER_OF__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -711,9 +782,12 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String APPLICABLE_SERVICES__UNIQUE_SERVICE__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For an ApplicableServices, there shall not be two ServiceType sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.service->isUnique( s : ServiceType | s.name )\n" + "}.status"; + protected static final String APPLICABLE_SERVICES__UNIQUE_SERVICE__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For an ApplicableServices, there shall not be two ServiceType sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tself.service->isUnique( s : ServiceType | s.name )\n" + + "}.status"; /** * Validates the uniqueService constraint of '<em>Applicable Services</em>'. @@ -723,9 +797,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateApplicableServices_uniqueService( ApplicableServices applicableServices, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.APPLICABLE_SERVICES, applicableServices, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueService", - APPLICABLE_SERVICES__UNIQUE_SERVICE__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.APPLICABLE_SERVICES, + applicableServices, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueService", + APPLICABLE_SERVICES__UNIQUE_SERVICE__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -758,9 +839,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String BASIC_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String BASIC_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Basic Type</em>'. @@ -770,9 +853,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateBasicType_nameAttributeRequired( BasicType basicType, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.BASIC_TYPE, basicType, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - BASIC_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.BASIC_TYPE, + basicType, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + BASIC_TYPE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -814,11 +904,13 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CDC__UNIQUE_CDC_CHILD__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For a CDC, there shall not be two sub-elements (SubDataObject or DataAttribute) with same name.',\n" - + "\tstatus : Boolean = \n" - + "\t\t\tlet names : Bag(String) = self.subDataObject.name->union(self.dataAttribute.name) in names->size() = names->asSet()->size()\n" - + "}.status"; + protected static final String CDC__UNIQUE_CDC_CHILD__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For a CDC, there shall not be two sub-elements (SubDataObject or DataAttribute) with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tlet names : Bag(String) = self.subDataObject.name->union(self.dataAttribute.name) in names->size() = names->asSet()->size()\n" + + + "}.status"; /** * Validates the uniqueCDCChild constraint of '<em>CDC</em>'. @@ -827,9 +919,16 @@ public class NsdValidator extends EObjectValidator { * @generated */ public boolean validateCDC_uniqueCDCChild( CDC cdc, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CDC, cdc, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueCDCChild", CDC__UNIQUE_CDC_CHILD__EEXPRESSION, - Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CDC, + cdc, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueCDCChild", + CDC__UNIQUE_CDC_CHILD__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -838,9 +937,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CDC__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String CDC__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>CDC</em>'. @@ -850,9 +951,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateCDC_nameAttributeRequired( CDC cdc, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CDC, cdc, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - CDC__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CDC, + cdc, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + CDC__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -881,14 +989,17 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CD_CS__UNIQUE_CDC__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'Within an NS, there shall not be two CDC sub-elements with same name and (if defined) variant.',\n" - + "\tstatus : Boolean = \n" + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" - + "\t\t\t-- For this, explicit links have to be created first\n" - + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" - + "\t\t\tself.cDC->select( c : CDC | c.variant = null )->isUnique( c : CDC | c.name )\n" - + "\t or self.cDC->select( c : CDC | c.variant <> null )->forAll( c1, c2 : CDC | c1 <> c2 implies c1.name <> c2.name or c1.variant <> c2.variant )\n" - + "}.status"; + protected static final String CD_CS__UNIQUE_CDC__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'Within an NS, there shall not be two CDC sub-elements with same name and (if defined) variant.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" + + "\t\t\t-- For this, explicit links have to be created first\n" + + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" + + "\t\t\tself.cDC->select( c : CDC | c.variant = null )->isUnique( c : CDC | c.name )\n" + + "\t or self.cDC->select( c : CDC | c.variant <> null )->forAll( c1, c2 : CDC | c1 <> c2 implies c1.name <> c2.name or c1.variant <> c2.variant )\n" + + + "}.status"; /** * Validates the uniqueCDC constraint of '<em>CD Cs</em>'. @@ -897,9 +1008,16 @@ public class NsdValidator extends EObjectValidator { * @generated */ public boolean validateCDCs_uniqueCDC( CDCs cdCs, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CD_CS, cdCs, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueCDC", CD_CS__UNIQUE_CDC__EEXPRESSION, - Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CD_CS, + cdCs, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueCDC", + CD_CS__UNIQUE_CDC__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -930,9 +1048,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CHANGES__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The version attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.version <> null\n" + "}.status"; + protected static final String CHANGES__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The version attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.version <> null\n" + + "}.status"; /** * Validates the versionAttributeRequired constraint of '<em>Changes</em>'. @@ -942,9 +1062,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateChanges_versionAttributeRequired( Changes changes, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CHANGES, changes, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "versionAttributeRequired", - CHANGES__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CHANGES, + changes, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "versionAttributeRequired", + CHANGES__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -984,10 +1111,12 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CONSTRUCTED_ATTRIBUTE__UNIQUE_SUB_DATA_ATTRIBUTE__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For a ConstructedAttribute, there shall not be two SubDataAttribute sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.subDataAttribute->isUnique( s : SubDataAttribute | s.name )\n" - + "}.status"; + protected static final String CONSTRUCTED_ATTRIBUTE__UNIQUE_SUB_DATA_ATTRIBUTE__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For a ConstructedAttribute, there shall not be two SubDataAttribute sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tself.subDataAttribute->isUnique( s : SubDataAttribute | s.name )\n" + + "}.status"; /** * Validates the uniqueSubDataAttribute constraint of '<em>Constructed Attribute</em>'. @@ -997,9 +1126,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateConstructedAttribute_uniqueSubDataAttribute( ConstructedAttribute constructedAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE, constructedAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueSubDataAttribute", - CONSTRUCTED_ATTRIBUTE__UNIQUE_SUB_DATA_ATTRIBUTE__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE, + constructedAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueSubDataAttribute", + CONSTRUCTED_ATTRIBUTE__UNIQUE_SUB_DATA_ATTRIBUTE__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1008,9 +1144,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CONSTRUCTED_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String CONSTRUCTED_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Constructed Attribute</em>'. @@ -1020,9 +1158,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateConstructedAttribute_nameAttributeRequired( ConstructedAttribute constructedAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE, constructedAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - CONSTRUCTED_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTE, + constructedAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + CONSTRUCTED_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1059,12 +1204,15 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String CONSTRUCTED_ATTRIBUTES__UNIQUE_CONSTRUCTED_ATTRIBUTE__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'Within an NS, there shall not be two ConstructedAttribute sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" - + "\t\t\t-- For this, explicit links have to be created first\n" - + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" - + "\t\t\tself.constructedAttribute->isUnique( c : ConstructedAttribute | c.name )\n" + "}.status"; + protected static final String CONSTRUCTED_ATTRIBUTES__UNIQUE_CONSTRUCTED_ATTRIBUTE__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'Within an NS, there shall not be two ConstructedAttribute sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" + + "\t\t\t-- For this, explicit links have to be created first\n" + + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" + + "\t\t\tself.constructedAttribute->isUnique( c : ConstructedAttribute | c.name )\n" + + "}.status"; /** * Validates the uniqueConstructedAttribute constraint of '<em>Constructed Attributes</em>'. @@ -1074,9 +1222,15 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateConstructedAttributes_uniqueConstructedAttribute( ConstructedAttributes constructedAttributes, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES, constructedAttributes, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueConstructedAttribute", - CONSTRUCTED_ATTRIBUTES__UNIQUE_CONSTRUCTED_ATTRIBUTE__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, + return validate( NsdPackage.Literals.CONSTRUCTED_ATTRIBUTES, + constructedAttributes, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueConstructedAttribute", + CONSTRUCTED_ATTRIBUTES__UNIQUE_CONSTRUCTED_ATTRIBUTE__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, 0 ); } @@ -1134,9 +1288,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Data Attribute</em>'. @@ -1146,9 +1302,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDataAttribute_nameAttributeRequired( DataAttribute dataAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DATA_ATTRIBUTE, dataAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DATA_ATTRIBUTE, + dataAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1157,9 +1320,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The fc attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.fc <> null\n" + "}.status"; + protected static final String DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The fc attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.fc <> null\n" + + "}.status"; /** * Validates the fcAttributeRequired constraint of '<em>Data Attribute</em>'. @@ -1169,9 +1334,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDataAttribute_fcAttributeRequired( DataAttribute dataAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DATA_ATTRIBUTE, dataAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "fcAttributeRequired", - DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DATA_ATTRIBUTE, + dataAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "fcAttributeRequired", + DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1206,9 +1378,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Data Object</em>'. @@ -1218,9 +1392,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDataObject_nameAttributeRequired( DataObject dataObject, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DATA_OBJECT, dataObject, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DATA_OBJECT, + dataObject, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1229,9 +1410,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The type attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.type <> null\n" + "}.status"; + protected static final String DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The type attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.type <> null\n" + + "}.status"; /** * Validates the typeAttributeRequired constraint of '<em>Data Object</em>'. @@ -1241,9 +1424,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDataObject_typeAttributeRequired( DataObject dataObject, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DATA_OBJECT, dataObject, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "typeAttributeRequired", - DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DATA_OBJECT, + dataObject, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "typeAttributeRequired", + DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1278,9 +1468,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DATA_SET_MEMBER_OF__CB_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The cb attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.cb <> null\n" + "}.status"; + protected static final String DATA_SET_MEMBER_OF__CB_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The cb attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.cb <> null\n" + + "}.status"; /** * Validates the cbAttributeRequired constraint of '<em>Data Set Member Of</em>'. @@ -1290,9 +1482,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDataSetMemberOf_cbAttributeRequired( DataSetMemberOf dataSetMemberOf, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DATA_SET_MEMBER_OF, dataSetMemberOf, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "cbAttributeRequired", - DATA_SET_MEMBER_OF__CB_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DATA_SET_MEMBER_OF, + dataSetMemberOf, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "cbAttributeRequired", + DATA_SET_MEMBER_OF__CB_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1321,9 +1520,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String DOC__ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The id attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.id <> null\n" + "}.status"; + protected static final String DOC__ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The id attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.id <> null\n" + + "}.status"; /** * Validates the idAttributeRequired constraint of '<em>Doc</em>'. @@ -1333,9 +1534,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateDoc_idAttributeRequired( Doc doc, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.DOC, doc, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "idAttributeRequired", - DOC__ID_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.DOC, + doc, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "idAttributeRequired", + DOC__ID_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1384,11 +1592,14 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ENUMERATION__UNIQUE_LITERAL_NAME__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For an Enumeration, there shall not be two Literal sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\t-- TODO: inherited literals should be taken into account\n" - + "\t\t\t-- For this, explicit links have to be created first\n" - + "\t\t\tself.literal->isUnique( l : Literal | l.name )\n" + "}.status"; + protected static final String ENUMERATION__UNIQUE_LITERAL_NAME__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For an Enumeration, there shall not be two Literal sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\t-- TODO: inherited literals should be taken into account\n" + + "\t\t\t-- For this, explicit links have to be created first\n" + + "\t\t\tself.literal->isUnique( l : Literal | l.name )\n" + + "}.status"; /** * Validates the uniqueLiteralName constraint of '<em>Enumeration</em>'. @@ -1398,9 +1609,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateEnumeration_uniqueLiteralName( Enumeration enumeration, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ENUMERATION, enumeration, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueLiteralName", - ENUMERATION__UNIQUE_LITERAL_NAME__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ENUMERATION, + enumeration, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueLiteralName", + ENUMERATION__UNIQUE_LITERAL_NAME__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1409,9 +1627,12 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ENUMERATION__UNIQUE_LITERAL_VAL__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'For an Enumeration, there shall not be two Literal sub-elements with same literalVal.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.literal->isUnique( l : Literal | l.literalVal )\n" + "}.status"; + protected static final String ENUMERATION__UNIQUE_LITERAL_VAL__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'For an Enumeration, there shall not be two Literal sub-elements with same literalVal.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tself.literal->isUnique( l : Literal | l.literalVal )\n" + + "}.status"; /** * Validates the uniqueLiteralVal constraint of '<em>Enumeration</em>'. @@ -1421,9 +1642,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateEnumeration_uniqueLiteralVal( Enumeration enumeration, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ENUMERATION, enumeration, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueLiteralVal", - ENUMERATION__UNIQUE_LITERAL_VAL__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ENUMERATION, + enumeration, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueLiteralVal", + ENUMERATION__UNIQUE_LITERAL_VAL__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1432,9 +1660,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ENUMERATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String ENUMERATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Enumeration</em>'. @@ -1444,9 +1674,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateEnumeration_nameAttributeRequired( Enumeration enumeration, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ENUMERATION, enumeration, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - ENUMERATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ENUMERATION, + enumeration, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + ENUMERATION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1480,12 +1717,14 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String ENUMERATIONS__UNIQUE_ENUMERATION__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'Within an NS, there shall not be two Enumeration sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" - + "\t\t\t-- For this, explicit links have to be created first\n" - + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" - + "\t\t\tself.enumeration->isUnique( e : Enumeration | e.name )\n" + "}.status"; + protected static final String ENUMERATIONS__UNIQUE_ENUMERATION__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'Within an NS, there shall not be two Enumeration sub-elements with same name.',\n" + + "\tstatus : Boolean = \n" + + "\t\t\t-- TODO: DependsOn NS should be taken into account ?\n" + + "\t\t\t-- For this, explicit links have to be created first\n" + + "\t\t\t-- Then, may be this constraint should be in NS and not in Enumerations ?\n" + + "\t\t\tself.enumeration->isUnique( e : Enumeration | e.name )\n" + + "}.status"; /** * Validates the uniqueEnumeration constraint of '<em>Enumerations</em>'. @@ -1495,9 +1734,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateEnumerations_uniqueEnumeration( Enumerations enumerations, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.ENUMERATIONS, enumerations, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueEnumeration", - ENUMERATIONS__UNIQUE_ENUMERATION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.ENUMERATIONS, + enumerations, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueEnumeration", + ENUMERATIONS__UNIQUE_ENUMERATION__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1534,9 +1780,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String FUNCTIONAL_CONSTRAINT__ABBREVIATION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The abbreviation attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.abbreviation <> null\n" + "}.status"; + protected static final String FUNCTIONAL_CONSTRAINT__ABBREVIATION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The abbreviation attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.abbreviation <> null\n" + + "}.status"; /** * Validates the abbreviationAttributeRequired constraint of '<em>Functional Constraint</em>'. @@ -1546,10 +1794,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateFunctionalConstraint_abbreviationAttributeRequired( FunctionalConstraint functionalConstraint, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.FUNCTIONAL_CONSTRAINT, functionalConstraint, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "abbreviationAttributeRequired", - FUNCTIONAL_CONSTRAINT__ABBREVIATION_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, - DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.FUNCTIONAL_CONSTRAINT, + functionalConstraint, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "abbreviationAttributeRequired", + FUNCTIONAL_CONSTRAINT__ABBREVIATION_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1586,10 +1840,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String FUNCTIONAL_CONSTRAINTS__UNIQUE_FUNCTIONAL_CONSTRAINT__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'There shall not be two FunctionalConstraint elements with same abbreviation.',\n" - + "\tstatus : Boolean = \n" - + "\t\t\tself.functionalConstraint->isUnique( f : FunctionalConstraint | f.abbreviation )\n" + "}.status"; + protected static final String FUNCTIONAL_CONSTRAINTS__UNIQUE_FUNCTIONAL_CONSTRAINT__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'There shall not be two FunctionalConstraint elements with same abbreviation.',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.functionalConstraint->isUnique( f : FunctionalConstraint | f.abbreviation )\n" + + "}.status"; /** * Validates the uniqueFunctionalConstraint constraint of '<em>Functional Constraints</em>'. @@ -1599,9 +1854,15 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateFunctionalConstraints_uniqueFunctionalConstraint( FunctionalConstraints functionalConstraints, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.FUNCTIONAL_CONSTRAINTS, functionalConstraints, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueFunctionalConstraint", - FUNCTIONAL_CONSTRAINTS__UNIQUE_FUNCTIONAL_CONSTRAINT__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, + return validate( NsdPackage.Literals.FUNCTIONAL_CONSTRAINTS, + functionalConstraints, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueFunctionalConstraint", + FUNCTIONAL_CONSTRAINTS__UNIQUE_FUNCTIONAL_CONSTRAINT__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, 0 ); } @@ -1644,9 +1905,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String LITERAL__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String LITERAL__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Literal</em>'. @@ -1656,9 +1919,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateLiteral_nameAttributeRequired( Literal literal, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.LITERAL, literal, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - LITERAL__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.LITERAL, + literal, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + LITERAL__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1667,9 +1937,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String LITERAL__LITERAL_VAL_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The literalVal attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.literalVal <> null\n" + "}.status"; + protected static final String LITERAL__LITERAL_VAL_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The literalVal attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.literalVal <> null\n" + + "}.status"; /** * Validates the literalValAttributeRequired constraint of '<em>Literal</em>'. @@ -1679,9 +1951,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateLiteral_literalValAttributeRequired( Literal literal, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.LITERAL, literal, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "literalValAttributeRequired", - LITERAL__LITERAL_VAL_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.LITERAL, + literal, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "literalValAttributeRequired", + LITERAL__LITERAL_VAL_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1716,9 +1995,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>LN Class</em>'. @@ -1728,9 +2009,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateLNClass_nameAttributeRequired( LNClass lnClass, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.LN_CLASS, lnClass, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.LN_CLASS, + lnClass, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + LN_CLASS__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1765,10 +2053,12 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String LN_CLASSES__UNIQUE_ABSTRACT_LN_CLASS__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'Within an NS, there shall not be two AbstractLNClass sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.abstractLNClass->isUnique( c : AbstractLNClass | c.name )\n" - + "}.status"; + protected static final String LN_CLASSES__UNIQUE_ABSTRACT_LN_CLASS__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'Within an NS, there shall not be two AbstractLNClass sub-elements with same name.',\n" + + + "\tstatus : Boolean = \n" + + "\t\t\tself.abstractLNClass->isUnique( c : AbstractLNClass | c.name )\n" + + "}.status"; /** * Validates the uniqueAbstractLNClass constraint of '<em>LN Classes</em>'. @@ -1778,9 +2068,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateLNClasses_uniqueAbstractLNClass( LNClasses lnClasses, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.LN_CLASSES, lnClasses, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueAbstractLNClass", - LN_CLASSES__UNIQUE_ABSTRACT_LN_CLASS__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.LN_CLASSES, + lnClasses, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueAbstractLNClass", + LN_CLASSES__UNIQUE_ABSTRACT_LN_CLASS__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1789,9 +2086,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String LN_CLASSES__UNIQUE_LN_CLASS__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'Within an NS, there shall not be two LNClass sub-elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.lNClass->isUnique( c : LNClass | c.name )\n" + "}.status"; + protected static final String LN_CLASSES__UNIQUE_LN_CLASS__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'Within an NS, there shall not be two LNClass sub-elements with same name.',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.lNClass->isUnique( c : LNClass | c.name )\n" + + "}.status"; /** * Validates the uniqueLNClass constraint of '<em>LN Classes</em>'. @@ -1801,9 +2100,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateLNClasses_uniqueLNClass( LNClasses lnClasses, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.LN_CLASSES, lnClasses, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniqueLNClass", - LN_CLASSES__UNIQUE_LN_CLASS__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.LN_CLASSES, + lnClasses, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniqueLNClass", + LN_CLASSES__UNIQUE_LN_CLASS__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1869,9 +2175,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String NS_DOC__LANG_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The lang attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.lang <> null\n" + "}.status"; + protected static final String NS_DOC__LANG_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The lang attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.lang <> null\n" + + "}.status"; /** * Validates the langAttributeRequired constraint of '<em>NS Doc</em>'. @@ -1881,9 +2189,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateNSDoc_langAttributeRequired( NSDoc nsDoc, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.NS_DOC, nsDoc, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "langAttributeRequired", - NS_DOC__LANG_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.NS_DOC, + nsDoc, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "langAttributeRequired", + NS_DOC__LANG_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1919,9 +2234,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String PRESENCE_CONDITION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String PRESENCE_CONDITION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Presence Condition</em>'. @@ -1931,9 +2248,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validatePresenceCondition_nameAttributeRequired( PresenceCondition presenceCondition, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.PRESENCE_CONDITION, presenceCondition, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - PRESENCE_CONDITION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.PRESENCE_CONDITION, + presenceCondition, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + PRESENCE_CONDITION__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -1969,10 +2293,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String PRESENCE_CONDITIONS__UNIQUE_PRESENCE_CONDITION__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'There shall not be two PresenceCondition elements with same name.',\n" - + "\tstatus : Boolean = \n" + "\t\t\tself.presenceCondition->isUnique( p : PresenceCondition | p.name )\n" - + "}.status"; + protected static final String PRESENCE_CONDITIONS__UNIQUE_PRESENCE_CONDITION__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'There shall not be two PresenceCondition elements with same name.',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.presenceCondition->isUnique( p : PresenceCondition | p.name )\n" + + "}.status"; /** * Validates the uniquePresenceCondition constraint of '<em>Presence Conditions</em>'. @@ -1982,9 +2307,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validatePresenceConditions_uniquePresenceCondition( PresenceConditions presenceConditions, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.PRESENCE_CONDITIONS, presenceConditions, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "uniquePresenceCondition", - PRESENCE_CONDITIONS__UNIQUE_PRESENCE_CONDITION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.PRESENCE_CONDITIONS, + presenceConditions, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "uniquePresenceCondition", + PRESENCE_CONDITIONS__UNIQUE_PRESENCE_CONDITION__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2017,9 +2349,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SERVICE_CDC__CDC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The cdc attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.cdc <> null\n" + "}.status"; + protected static final String SERVICE_CDC__CDC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The cdc attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.cdc <> null\n" + + "}.status"; /** * Validates the cdcAttributeRequired constraint of '<em>Service CDC</em>'. @@ -2029,9 +2363,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateServiceCDC_cdcAttributeRequired( ServiceCDC serviceCDC, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SERVICE_CDC, serviceCDC, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "cdcAttributeRequired", - SERVICE_CDC__CDC_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SERVICE_CDC, + serviceCDC, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "cdcAttributeRequired", + SERVICE_CDC__CDC_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2123,9 +2464,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SERVICE_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String SERVICE_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Service Data Attribute</em>'. @@ -2135,9 +2478,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateServiceDataAttribute_nameAttributeRequired( ServiceDataAttribute serviceDataAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE, serviceDataAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - SERVICE_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE, + serviceDataAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + SERVICE_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2146,9 +2496,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SERVICE_DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The fc attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.fc <> null\n" + "}.status"; + protected static final String SERVICE_DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The fc attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.fc <> null\n" + + "}.status"; /** * Validates the fcAttributeRequired constraint of '<em>Service Data Attribute</em>'. @@ -2158,9 +2510,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateServiceDataAttribute_fcAttributeRequired( ServiceDataAttribute serviceDataAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE, serviceDataAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "fcAttributeRequired", - SERVICE_DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SERVICE_DATA_ATTRIBUTE, + serviceDataAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "fcAttributeRequired", + SERVICE_DATA_ATTRIBUTE__FC_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2249,9 +2608,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SERVICE_PARAMETER__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String SERVICE_PARAMETER__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Service Parameter</em>'. @@ -2261,9 +2622,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateServiceParameter_nameAttributeRequired( ServiceParameter serviceParameter, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SERVICE_PARAMETER, serviceParameter, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - SERVICE_PARAMETER__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SERVICE_PARAMETER, + serviceParameter, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + SERVICE_PARAMETER__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2308,9 +2676,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SUB_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String SUB_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Sub Data Attribute</em>'. @@ -2320,9 +2690,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateSubDataAttribute_nameAttributeRequired( SubDataAttribute subDataAttribute, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SUB_DATA_ATTRIBUTE, subDataAttribute, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - SUB_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SUB_DATA_ATTRIBUTE, + subDataAttribute, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + SUB_DATA_ATTRIBUTE__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2359,9 +2736,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SUB_DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The name attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.name <> null\n" + "}.status"; + protected static final String SUB_DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The name attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.name <> null\n" + + "}.status"; /** * Validates the nameAttributeRequired constraint of '<em>Sub Data Object</em>'. @@ -2371,9 +2750,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateSubDataObject_nameAttributeRequired( SubDataObject subDataObject, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SUB_DATA_OBJECT, subDataObject, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "nameAttributeRequired", - SUB_DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SUB_DATA_OBJECT, + subDataObject, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "nameAttributeRequired", + SUB_DATA_OBJECT__NAME_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2382,9 +2768,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String SUB_DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The type attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.type <> null\n" + "}.status"; + protected static final String SUB_DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The type attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.type <> null\n" + + "}.status"; /** * Validates the typeAttributeRequired constraint of '<em>Sub Data Object</em>'. @@ -2394,9 +2782,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateSubDataObject_typeAttributeRequired( SubDataObject subDataObject, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.SUB_DATA_OBJECT, subDataObject, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "typeAttributeRequired", - SUB_DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.SUB_DATA_OBJECT, + subDataObject, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "typeAttributeRequired", + SUB_DATA_OBJECT__TYPE_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2429,9 +2824,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String TITLED_CLASS__TITLE_ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The titleID attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.titleID <> null\n" + "}.status"; + protected static final String TITLED_CLASS__TITLE_ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The titleID attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.titleID <> null\n" + + "}.status"; /** * Validates the titleIDAttributeRequired constraint of '<em>Titled Class</em>'. @@ -2441,9 +2838,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateTitledClass_titleIDAttributeRequired( TitledClass titledClass, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.TITLED_CLASS, titledClass, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "titleIDAttributeRequired", - TITLED_CLASS__TITLE_ID_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.TITLED_CLASS, + titledClass, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "titleIDAttributeRequired", + TITLED_CLASS__TITLE_ID_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2491,9 +2895,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String AG_NS_IDENTIFICATION__ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The id attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.id <> null\n" + "}.status"; + protected static final String AG_NS_IDENTIFICATION__ID_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The id attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.id <> null\n" + + "}.status"; /** * Validates the idAttributeRequired constraint of '<em>Ag NS Identification</em>'. @@ -2503,9 +2909,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAgNSIdentification_idAttributeRequired( AgNSIdentification agNSIdentification, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.AG_NS_IDENTIFICATION, agNSIdentification, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "idAttributeRequired", - AG_NS_IDENTIFICATION__ID_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.AG_NS_IDENTIFICATION, + agNSIdentification, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "idAttributeRequired", + AG_NS_IDENTIFICATION__ID_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /** @@ -2514,9 +2927,11 @@ public class NsdValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - protected static final String AG_NS_IDENTIFICATION__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" - + "\tmessage : String = 'The version attribute is required',\n" + "\tstatus : Boolean = \n" - + "\t\t\tself.version <> null\n" + "}.status"; + protected static final String AG_NS_IDENTIFICATION__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION = "Tuple {\n" + + "\tmessage : String = 'The version attribute is required',\n" + + "\tstatus : Boolean = \n" + + "\t\t\tself.version <> null\n" + + "}.status"; /** * Validates the versionAttributeRequired constraint of '<em>Ag NS Identification</em>'. @@ -2526,9 +2941,16 @@ public class NsdValidator extends EObjectValidator { */ public boolean validateAgNSIdentification_versionAttributeRequired( AgNSIdentification agNSIdentification, DiagnosticChain diagnostics, Map< Object, Object > context ) { - return validate( NsdPackage.Literals.AG_NS_IDENTIFICATION, agNSIdentification, diagnostics, context, - "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", "versionAttributeRequired", - AG_NS_IDENTIFICATION__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0 ); + return validate( NsdPackage.Literals.AG_NS_IDENTIFICATION, + agNSIdentification, + diagnostics, + context, + "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", + "versionAttributeRequired", + AG_NS_IDENTIFICATION__VERSION_ATTRIBUTE_REQUIRED__EEXPRESSION, + Diagnostic.ERROR, + DIAGNOSTIC_SOURCE, + 0 ); } /**