Commit 0d2eed15 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '24-functionalconstraint-has-also-a-titleid-attribute' into 'master'

Resolve "FunctionalConstraint has also a titleID attribute"

Closes #24

See merge request !23
parents b0a27258 9af0899a
Pipeline #7723 passed with stages
in 30 seconds
...@@ -586,3 +586,11 @@ _UI_AgAttributeType_refersToEnumeration_feature = Refers To Enumeration ...@@ -586,3 +586,11 @@ _UI_AgAttributeType_refersToEnumeration_feature = Refers To Enumeration
_UI_Doc_referredByTitledClass_feature = Referred By Titled Class _UI_Doc_referredByTitledClass_feature = Referred By Titled Class
_UI_DocumentedClass_refersToDescDoc_feature = Refers To Desc Doc _UI_DocumentedClass_refersToDescDoc_feature = Refers To Desc Doc
_UI_TitledClass_refersToTitleDoc_feature = Refers To Title Doc _UI_TitledClass_refersToTitleDoc_feature = Refers To Title Doc
_UI_Doc_referredByFunctionalConstraintAsDesc_feature = Referred By Functional Constraint As Desc
_UI_Doc_referredByFunctionalConstraintAsTitle_feature = Referred By Functional Constraint As Title
_UI_FunctionalConstraint_refersToDescDoc_feature = Refers To Desc Doc
_UI_FunctionalConstraint_refersToTitleDoc_feature = Refers To Title Doc
_UI_Doc_referredByPresenceConditionAsDesc_feature = Referred By Presence Condition As Desc
_UI_Doc_referredByPresenceConditionAsTitle_feature = Referred By Presence Condition As Title
_UI_PresenceCondition_refersToDescDoc_feature = Refers To Desc Doc
_UI_PresenceCondition_refersToTitleDoc_feature = Refers To Title Doc
...@@ -71,14 +71,16 @@ public class DocItemProvider extends NsdObjectItemProvider { ...@@ -71,14 +71,16 @@ public class DocItemProvider extends NsdObjectItemProvider {
addIdPropertyDescriptor( object ); addIdPropertyDescriptor( object );
addReferredByAgNSDescPropertyDescriptor( object ); addReferredByAgNSDescPropertyDescriptor( object );
addReferredByPresenceConditionPropertyDescriptor( object ); addReferredByPresenceConditionAsDescPropertyDescriptor( object );
addReferredByAgPresenceConditionPropertyDescriptor( object ); addReferredByAgPresenceConditionPropertyDescriptor( object );
addReferredByAbbreviationPropertyDescriptor( object ); addReferredByAbbreviationPropertyDescriptor( object );
addReferredByBasicTypePropertyDescriptor( object ); addReferredByBasicTypePropertyDescriptor( object );
addReferredByDocumentedClassPropertyDescriptor( object ); addReferredByDocumentedClassPropertyDescriptor( object );
addReferredByFunctionalConstraintPropertyDescriptor( object ); addReferredByFunctionalConstraintAsDescPropertyDescriptor( object );
addReferredByAgPresenceConditionDerivedStatisticsPropertyDescriptor( object ); addReferredByAgPresenceConditionDerivedStatisticsPropertyDescriptor( object );
addReferredByTitledClassPropertyDescriptor( object ); addReferredByTitledClassPropertyDescriptor( object );
addReferredByFunctionalConstraintAsTitlePropertyDescriptor( object );
addReferredByPresenceConditionAsTitlePropertyDescriptor( object );
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -127,19 +129,19 @@ public class DocItemProvider extends NsdObjectItemProvider { ...@@ -127,19 +129,19 @@ public class DocItemProvider extends NsdObjectItemProvider {
} }
/** /**
* This adds a property descriptor for the Referred By Presence Condition feature. * This adds a property descriptor for the Referred By Presence Condition As Desc feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addReferredByPresenceConditionPropertyDescriptor( Object object ) { protected void addReferredByPresenceConditionAsDescPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add( itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString( "_UI_Doc_referredByPresenceCondition_feature" ), getString( "_UI_Doc_referredByPresenceConditionAsDesc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_Doc_referredByPresenceCondition_feature", getString( "_UI_PropertyDescriptor_description",
"_UI_Doc_type" ), "_UI_Doc_referredByPresenceConditionAsDesc_feature", "_UI_Doc_type" ),
NsdPackage.Literals.DOC__REFERRED_BY_PRESENCE_CONDITION, NsdPackage.Literals.DOC__REFERRED_BY_PRESENCE_CONDITION_AS_DESC,
true, true,
false, false,
true, true,
...@@ -237,19 +239,19 @@ public class DocItemProvider extends NsdObjectItemProvider { ...@@ -237,19 +239,19 @@ public class DocItemProvider extends NsdObjectItemProvider {
} }
/** /**
* This adds a property descriptor for the Referred By Functional Constraint feature. * This adds a property descriptor for the Referred By Functional Constraint As Desc feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addReferredByFunctionalConstraintPropertyDescriptor( Object object ) { protected void addReferredByFunctionalConstraintAsDescPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add( itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString( "_UI_Doc_referredByFunctionalConstraint_feature" ), getString( "_UI_Doc_referredByFunctionalConstraintAsDesc_feature" ),
getString( "_UI_PropertyDescriptor_description", getString( "_UI_PropertyDescriptor_description",
"_UI_Doc_referredByFunctionalConstraint_feature", "_UI_Doc_type" ), "_UI_Doc_referredByFunctionalConstraintAsDesc_feature", "_UI_Doc_type" ),
NsdPackage.Literals.DOC__REFERRED_BY_FUNCTIONAL_CONSTRAINT, NsdPackage.Literals.DOC__REFERRED_BY_FUNCTIONAL_CONSTRAINT_AS_DESC,
true, true,
false, false,
true, true,
...@@ -302,6 +304,50 @@ public class DocItemProvider extends NsdObjectItemProvider { ...@@ -302,6 +304,50 @@ public class DocItemProvider extends NsdObjectItemProvider {
null ) ); null ) );
} }
/**
* This adds a property descriptor for the Referred By Functional Constraint As Title feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByFunctionalConstraintAsTitlePropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_Doc_referredByFunctionalConstraintAsTitle_feature" ),
getString( "_UI_PropertyDescriptor_description",
"_UI_Doc_referredByFunctionalConstraintAsTitle_feature", "_UI_Doc_type" ),
NsdPackage.Literals.DOC__REFERRED_BY_FUNCTIONAL_CONSTRAINT_AS_TITLE,
true,
false,
true,
null,
null,
null ) );
}
/**
* This adds a property descriptor for the Referred By Presence Condition As Title feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByPresenceConditionAsTitlePropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_Doc_referredByPresenceConditionAsTitle_feature" ),
getString( "_UI_PropertyDescriptor_description",
"_UI_Doc_referredByPresenceConditionAsTitle_feature", "_UI_Doc_type" ),
NsdPackage.Literals.DOC__REFERRED_BY_PRESENCE_CONDITION_AS_TITLE,
true,
false,
true,
null,
null,
null ) );
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
......
...@@ -67,7 +67,8 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { ...@@ -67,7 +67,8 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider {
addDescIDPropertyDescriptor( object ); addDescIDPropertyDescriptor( object );
addTitleIDPropertyDescriptor( object ); addTitleIDPropertyDescriptor( object );
addReferredByDataAttributePropertyDescriptor( object ); addReferredByDataAttributePropertyDescriptor( object );
addRefersToDocPropertyDescriptor( object ); addRefersToDescDocPropertyDescriptor( object );
addRefersToTitleDocPropertyDescriptor( object );
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -161,19 +162,41 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider { ...@@ -161,19 +162,41 @@ public class FunctionalConstraintItemProvider extends NsdObjectItemProvider {
} }
/** /**
* This adds a property descriptor for the Refers To Doc feature. * This adds a property descriptor for the Refers To Desc Doc feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addRefersToDocPropertyDescriptor( Object object ) { protected void addRefersToDescDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add( itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString( "_UI_FunctionalConstraint_refersToDoc_feature" ), getString( "_UI_FunctionalConstraint_refersToDescDoc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_FunctionalConstraint_refersToDoc_feature", getString( "_UI_PropertyDescriptor_description",
"_UI_FunctionalConstraint_type" ), "_UI_FunctionalConstraint_refersToDescDoc_feature", "_UI_FunctionalConstraint_type" ),
NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__REFERS_TO_DOC, NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__REFERS_TO_DESC_DOC,
true,
false,
true,
null,
null,
null ) );
}
/**
* This adds a property descriptor for the Refers To Title Doc feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToTitleDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_FunctionalConstraint_refersToTitleDoc_feature" ),
getString( "_UI_PropertyDescriptor_description",
"_UI_FunctionalConstraint_refersToTitleDoc_feature", "_UI_FunctionalConstraint_type" ),
NsdPackage.Literals.FUNCTIONAL_CONSTRAINT__REFERS_TO_TITLE_DOC,
true, true,
false, false,
true, true,
......
...@@ -69,7 +69,8 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { ...@@ -69,7 +69,8 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider {
addReferredBySubDataObjectPropertyDescriptor( object ); addReferredBySubDataObjectPropertyDescriptor( object );
addReferredByDataAttributePropertyDescriptor( object ); addReferredByDataAttributePropertyDescriptor( object );
addReferredBySubDataAttributePropertyDescriptor( object ); addReferredBySubDataAttributePropertyDescriptor( object );
addRefersToDocPropertyDescriptor( object ); addRefersToDescDocPropertyDescriptor( object );
addRefersToTitleDocPropertyDescriptor( object );
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -274,19 +275,41 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider { ...@@ -274,19 +275,41 @@ public class PresenceConditionItemProvider extends NsdObjectItemProvider {
} }
/** /**
* This adds a property descriptor for the Refers To Doc feature. * This adds a property descriptor for the Refers To Desc Doc feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addRefersToDocPropertyDescriptor( Object object ) { protected void addRefersToDescDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add( itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString( "_UI_PresenceCondition_refersToDoc_feature" ), getString( "_UI_PresenceCondition_refersToDescDoc_feature" ),
getString( "_UI_PropertyDescriptor_description", "_UI_PresenceCondition_refersToDoc_feature", getString( "_UI_PropertyDescriptor_description",
"_UI_PresenceCondition_type" ), "_UI_PresenceCondition_refersToDescDoc_feature", "_UI_PresenceCondition_type" ),
NsdPackage.Literals.PRESENCE_CONDITION__REFERS_TO_DOC, NsdPackage.Literals.PRESENCE_CONDITION__REFERS_TO_DESC_DOC,
true,
false,
true,
null,
null,
null ) );
}
/**
* This adds a property descriptor for the Refers To Title Doc feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToTitleDocPropertyDescriptor( Object object ) {
itemPropertyDescriptors.add(
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
getResourceLocator(),
getString( "_UI_PresenceCondition_refersToTitleDoc_feature" ),
getString( "_UI_PropertyDescriptor_description",
"_UI_PresenceCondition_refersToTitleDoc_feature", "_UI_PresenceCondition_type" ),
NsdPackage.Literals.PRESENCE_CONDITION__REFERS_TO_TITLE_DOC,
true, true,
false, false,
true, true,
......
...@@ -905,9 +905,9 @@ ...@@ -905,9 +905,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByAgNSDesc" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByAgNSDesc" ordered="false"
upperBound="-1" eType="#//AgNSdesc" transient="true" unsettable="true" resolveProxies="false" upperBound="-1" eType="#//AgNSdesc" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//AgNSdesc/refersToDoc"/> eOpposite="#//AgNSdesc/refersToDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByPresenceCondition" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByPresenceConditionAsDesc"
ordered="false" upperBound="-1" eType="#//PresenceCondition" transient="true" ordered="false" upperBound="-1" eType="#//PresenceCondition" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//PresenceCondition/refersToDoc"/> unsettable="true" resolveProxies="false" eOpposite="#//PresenceCondition/refersToDescDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByAgPresenceCondition" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByAgPresenceCondition"
ordered="false" upperBound="-1" eType="#//AgPresenceCondition" transient="true" ordered="false" upperBound="-1" eType="#//AgPresenceCondition" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceCondition/refersToPresCondArgsDoc"/> unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceCondition/refersToPresCondArgsDoc"/>
...@@ -920,15 +920,21 @@ ...@@ -920,15 +920,21 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByDocumentedClass" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByDocumentedClass"
ordered="false" upperBound="-1" eType="#//DocumentedClass" transient="true" ordered="false" upperBound="-1" eType="#//DocumentedClass" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//DocumentedClass/refersToDescDoc"/> unsettable="true" resolveProxies="false" eOpposite="#//DocumentedClass/refersToDescDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByFunctionalConstraint" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByFunctionalConstraintAsDesc"
ordered="false" upperBound="-1" eType="#//FunctionalConstraint" transient="true" ordered="false" upperBound="-1" eType="#//FunctionalConstraint" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//FunctionalConstraint/refersToDoc"/> unsettable="true" resolveProxies="false" eOpposite="#//FunctionalConstraint/refersToDescDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByAgPresenceConditionDerivedStatistics" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByAgPresenceConditionDerivedStatistics"
ordered="false" upperBound="-1" eType="#//AgPresenceConditionDerivedStatistics" ordered="false" upperBound="-1" eType="#//AgPresenceConditionDerivedStatistics"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceConditionDerivedStatistics/refersToDsPresCondArgsDoc"/> transient="true" unsettable="true" resolveProxies="false" eOpposite="#//AgPresenceConditionDerivedStatistics/refersToDsPresCondArgsDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByTitledClass" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByTitledClass"
ordered="false" upperBound="-1" eType="#//TitledClass" transient="true" unsettable="true" ordered="false" upperBound="-1" eType="#//TitledClass" transient="true" unsettable="true"
resolveProxies="false" eOpposite="#//TitledClass/refersToTitleDoc"/> resolveProxies="false" eOpposite="#//TitledClass/refersToTitleDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByFunctionalConstraintAsTitle"
ordered="false" upperBound="-1" eType="#//FunctionalConstraint" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//FunctionalConstraint/refersToTitleDoc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByPresenceConditionAsTitle"
ordered="false" upperBound="-1" eType="#//PresenceCondition" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//PresenceCondition/refersToTitleDoc"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DocumentedClass" abstract="true" eSuperTypes="#//NsdObject"> <eClassifiers xsi:type="ecore:EClass" name="DocumentedClass" abstract="true" eSuperTypes="#//NsdObject">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
...@@ -1078,8 +1084,10 @@ ...@@ -1078,8 +1084,10 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="referredByDataAttribute" <eStructuralFeatures xsi:type="ecore:EReference" name="referredByDataAttribute"
ordered="false" upperBound="-1" eType="#//DataAttribute" transient="true" ordered="false" upperBound="-1" eType="#//DataAttribute" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//DataAttribute/refersToFunctionalConstraint"/> unsettable="true" resolveProxies="false" eOpposite="#//DataAttribute/refersToFunctionalConstraint"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToDoc" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="refersToDescDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByFunctionalConstraint"/> eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByFunctionalConstraintAsDesc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToTitleDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByFunctionalConstraintAsTitle"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FunctionalConstraints" eSuperTypes="#//NsdObject"> <eClassifiers xsi:type="ecore:EClass" name="FunctionalConstraints" eSuperTypes="#//NsdObject">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
...@@ -1449,8 +1457,10 @@ ...@@ -1449,8 +1457,10 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="referredBySubDataAttribute" <eStructuralFeatures xsi:type="ecore:EReference" name="referredBySubDataAttribute"
ordered="false" upperBound="-1" eType="#//SubDataAttribute" transient="true" ordered="false" upperBound="-1" eType="#//SubDataAttribute" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//SubDataAttribute/refersToPresenceCondition"/> unsettable="true" resolveProxies="false" eOpposite="#//SubDataAttribute/refersToPresenceCondition"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToDoc" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="refersToDescDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByPresenceCondition"/> eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByPresenceConditionAsDesc"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="refersToTitleDoc" ordered="false"
eType="#//Doc" transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Doc/referredByPresenceConditionAsTitle"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PresenceConditions" eSuperTypes="#//NsdObject"> <eClassifiers xsi:type="ecore:EClass" name="PresenceConditions" eSuperTypes="#//NsdObject">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
......
...@@ -250,14 +250,16 @@ ...@@ -250,14 +250,16 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/id"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//Doc/id"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference nsd.ecore#//Doc/parentNSDoc"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference nsd.ecore#//Doc/parentNSDoc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/ReferredByAgNSDesc"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/ReferredByAgNSDesc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByPresenceCondition"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByPresenceConditionAsDesc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAgPresenceCondition"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAgPresenceCondition"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAbbreviation"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAbbreviation"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByBasicType"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByBasicType"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByDocumentedClass"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByDocumentedClass"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByFunctionalConstraint"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByFunctionalConstraintAsDesc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAgPresenceConditionDerivedStatistics"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByAgPresenceConditionDerivedStatistics"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByTitledClass"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByTitledClass"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByFunctionalConstraintAsTitle"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//Doc/referredByPresenceConditionAsTitle"/>
</genClasses> </genClasses>
<genClasses ecoreClass="nsd.ecore#//DocumentedClass"> <genClasses ecoreClass="nsd.ecore#//DocumentedClass">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/deprecated"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//DocumentedClass/deprecated"/>
...@@ -285,7 +287,8 @@ ...@@ -285,7 +287,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//FunctionalConstraint/titleID"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nsd.ecore#//FunctionalConstraint/titleID"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/parentFunctionalConstraints"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/parentFunctionalConstraints"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/referredByDataAttribute"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/referredByDataAttribute"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/refersToDoc"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/refersToDescDoc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraint/refersToTitleDoc"/>
</genClasses> </genClasses>
<genClasses ecoreClass="nsd.ecore#//FunctionalConstraints"> <genClasses ecoreClass="nsd.ecore#//FunctionalConstraints">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraints/functionalConstraint"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//FunctionalConstraints/functionalConstraint"/>
...@@ -346,7 +349,8 @@ ...@@ -346,7 +349,8 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredBySubDataObject"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredBySubDataObject"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredByDataAttribute"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredByDataAttribute"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredBySubDataAttribute"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/referredBySubDataAttribute"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/refersToDoc"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/refersToDescDoc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceCondition/refersToTitleDoc"/>
</genClasses> </genClasses>
<genClasses ecoreClass="nsd.ecore#//PresenceConditions"> <genClasses ecoreClass="nsd.ecore#//PresenceConditions">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceConditions/presenceCondition"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nsd.ecore#//PresenceConditions/presenceCondition"/>
......
...@@ -36,7 +36,8 @@ import org.eclipse.emf.common.util.EList; ...@@ -36,7 +36,8 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID <em>Title ID</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getTitleID <em>Title ID</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getParentFunctionalConstraints <em>Parent Functional Constraints</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getParentFunctionalConstraints <em>Parent Functional Constraints</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getReferredByDataAttribute <em>Referred By Data Attribute</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getReferredByDataAttribute <em>Referred By Data Attribute</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDoc <em>Refers To Doc</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDescDoc <em>Refers To Desc Doc</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToTitleDoc <em>Refers To Title Doc</em>}</li>
* </ul> * </ul>
* *
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint() * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint()
...@@ -318,54 +319,105 @@ public interface FunctionalConstraint extends NsdObject { ...@@ -318,54 +319,105 @@ public interface FunctionalConstraint extends NsdObject {
boolean isSetReferredByDataAttribute(); boolean isSetReferredByDataAttribute();
/** /**
* Returns the value of the '<em><b>Refers To Doc</b></em>' reference. * Returns the value of the '<em><b>Refers To Desc Doc</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraint <em>Referred By Functional Constraint</em>}'. * It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraintAsDesc <em>Referred By Functional Constraint As Desc</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Refers To Doc</em>' reference. * @return the value of the '<em>Refers To Desc Doc</em>' reference.
* @see #isSetRefersToDoc() * @see #isSetRefersToDescDoc()
* @see #unsetRefersToDoc() * @see #unsetRefersToDescDoc()
* @see #setRefersToDoc(Doc) * @see #setRefersToDescDoc(Doc)
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_RefersToDoc() * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_RefersToDescDoc()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraint * @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraintAsDesc
* @model opposite="referredByFunctionalConstraint" resolveProxies="false" unsettable="true" transient="true" ordered="false" * @model opposite="referredByFunctionalConstraintAsDesc" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated * @generated
*/ */
Doc getRefersToDoc(); Doc getRefersToDescDoc();
/** /**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDoc <em>Refers To Doc</em>}' reference. * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To Doc</em>' reference. * @param value the new value of the '<em>Refers To Desc Doc</em>' reference.
* @see #isSetRefersToDoc() * @see #isSetRefersToDescDoc()
* @see #unsetRefersToDoc() * @see #unsetRefersToDescDoc()
* @see #getRefersToDoc() * @see #getRefersToDescDoc()
* @generated * @generated
*/ */
void setRefersToDoc( Doc value ); void setRefersToDescDoc( Doc value );
/** /**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDoc <em>Refers To Doc</em>}' reference. * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #isSetRefersToDoc() * @see #isSetRefersToDescDoc()
* @see #getRefersToDoc() * @see #getRefersToDescDoc()
* @see #setRefersToDoc(Doc) * @see #setRefersToDescDoc(Doc)
* @generated * @generated
*/ */
void unsetRefersToDoc(); void unsetRefersToDescDoc();
/** /**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDoc <em>Refers To Doc</em>}' reference is set. * Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToDescDoc <em>Refers To Desc Doc</em>}' reference is set.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To Doc</em>' reference is set. * @return whether the value of the '<em>Refers To Desc Doc</em>' reference is set.
* @see #unsetRefersToDoc() * @see #unsetRefersToDescDoc()
* @see #getRefersToDoc() * @see #getRefersToDescDoc()
* @see #setRefersToDoc(Doc) * @see #setRefersToDescDoc(Doc)
* @generated * @generated
*/ */
boolean isSetRefersToDoc(); boolean isSetRefersToDescDoc();
/**
* Returns the value of the '<em><b>Refers To Title Doc</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraintAsTitle <em>Referred By Functional Constraint As Title</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Refers To Title Doc</em>' reference.
* @see #isSetRefersToTitleDoc()
* @see #unsetRefersToTitleDoc()
* @see #setRefersToTitleDoc(Doc)
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage#getFunctionalConstraint_RefersToTitleDoc()
* @see fr.centralesupelec.edf.riseclipse.iec61850.nsd.Doc#getReferredByFunctionalConstraintAsTitle
* @model opposite="referredByFunctionalConstraintAsTitle" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
Doc getRefersToTitleDoc();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToTitleDoc <em>Refers To Title Doc</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To Title Doc</em>' reference.
* @see #isSetRefersToTitleDoc()
* @see #unsetRefersToTitleDoc()
* @see #getRefersToTitleDoc()
* @generated
*/
void setRefersToTitleDoc( Doc value );
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToTitleDoc <em>Refers To Title Doc</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetRefersToTitleDoc()
* @see #getRefersToTitleDoc()
* @see #setRefersToTitleDoc(Doc)
* @generated
*/
void unsetRefersToTitleDoc();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.FunctionalConstraint#getRefersToTitleDoc <em>Refers To Title Doc</em>}' reference is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To Title Doc</em>' reference is set.
* @see #unsetRefersToTitleDoc()
* @see #getRefersToTitleDoc()
* @see #setRefersToTitleDoc(Doc)
* @generated
*/
boolean isSetRefersToTitleDoc();
} // FunctionalConstraint } // FunctionalConstraint
...@@ -40,7 +40,8 @@ import org.eclipse.emf.common.util.EList; ...@@ -40,7 +40,8 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getReferredBySubDataObject <em>Referred By Sub Data Object</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getReferredBySubDataObject <em>Referred By Sub Data Object</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getReferredByDataAttribute <em>Referred By Data Attribute</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.PresenceCondition#getReferredByDataAttribute <em>Referred By Data Attribute</em>}</li>