Commit 63be2923 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '37-correct-explicit-links-from-fcda' into 'master'

Resolve "correct explicit links from FCDA"

Closes #37

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!33
parents 9679b14d 0cd2b1f1
...@@ -1094,3 +1094,7 @@ _UI_AgDATrgOp_qchg_feature = Qchg ...@@ -1094,3 +1094,7 @@ _UI_AgDATrgOp_qchg_feature = Qchg
_UI_AgVirtual_virtual_feature = Virtual _UI_AgVirtual_virtual_feature = Virtual
_UI_AgSmvOpts_dataRef_feature = Data Ref _UI_AgSmvOpts_dataRef_feature = Data Ref
_UI_AgOptFields_segmentation_feature = Segmentation _UI_AgOptFields_segmentation_feature = Segmentation
_UI_AbstractDataAttribute_RefersToDAType_feature = Refers To DA Type
_UI_DAType_ReferredByAbstractDataAttribute_feature = Referred By Abstract Data Attribute
_UI_AbstractDataAttribute_ReferredByFCDA_feature = Referred By FCDA
_UI_FCDA_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute
...@@ -68,6 +68,8 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider ...@@ -68,6 +68,8 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
addValImportPropertyDescriptor(object); addValImportPropertyDescriptor(object);
addValKindPropertyDescriptor(object); addValKindPropertyDescriptor(object);
addRefersToEnumTypePropertyDescriptor(object); addRefersToEnumTypePropertyDescriptor(object);
addRefersToDATypePropertyDescriptor(object);
addReferredByFCDAPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -226,6 +228,50 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider ...@@ -226,6 +228,50 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
null)); null));
} }
/**
* This adds a property descriptor for the Refers To DA Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDATypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataAttribute_RefersToDAType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_RefersToDAType_feature", "_UI_AbstractDataAttribute_type"),
SclPackage.eINSTANCE.getAbstractDataAttribute_RefersToDAType(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Referred By FCDA feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByFCDAPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataAttribute_ReferredByFCDA_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByFCDA_feature", "_UI_AbstractDataAttribute_type"),
SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByFCDA(),
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
......
...@@ -65,7 +65,6 @@ public class AnyLNItemProvider extends UnNamingItemProvider { ...@@ -65,7 +65,6 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
addLnClassPropertyDescriptor(object); addLnClassPropertyDescriptor(object);
addLnTypePropertyDescriptor(object); addLnTypePropertyDescriptor(object);
addRefersToLNodeTypePropertyDescriptor(object); addRefersToLNodeTypePropertyDescriptor(object);
addReferredByFCDAPropertyDescriptor(object);
addReferredByExtRefPropertyDescriptor(object); addReferredByExtRefPropertyDescriptor(object);
addReferredByClientLNPropertyDescriptor(object); addReferredByClientLNPropertyDescriptor(object);
addReferredByLogControlPropertyDescriptor(object); addReferredByLogControlPropertyDescriptor(object);
...@@ -164,28 +163,6 @@ public class AnyLNItemProvider extends UnNamingItemProvider { ...@@ -164,28 +163,6 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Referred By FCDA feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByFCDAPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AnyLN_ReferredByFCDA_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByFCDA_feature", "_UI_AnyLN_type"),
SclPackage.eINSTANCE.getAnyLN_ReferredByFCDA(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This adds a property descriptor for the Referred By Ext Ref feature. * This adds a property descriptor for the Referred By Ext Ref feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
......
...@@ -65,7 +65,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider { ...@@ -65,7 +65,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
addDupdPropertyDescriptor(object); addDupdPropertyDescriptor(object);
addQchgPropertyDescriptor(object); addQchgPropertyDescriptor(object);
addFcPropertyDescriptor(object); addFcPropertyDescriptor(object);
addRefersToDATypePropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -158,28 +157,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider { ...@@ -158,28 +157,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Refers To DA Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDATypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DA_RefersToDAType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DA_RefersToDAType_feature", "_UI_DA_type"),
SclPackage.eINSTANCE.getDA_RefersToDAType(),
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
......
...@@ -62,7 +62,7 @@ public class DATypeItemProvider extends IDNamingItemProvider { ...@@ -62,7 +62,7 @@ public class DATypeItemProvider extends IDNamingItemProvider {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addIedTypePropertyDescriptor(object); addIedTypePropertyDescriptor(object);
addReferredByDAPropertyDescriptor(object); addReferredByAbstractDataAttributePropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -90,19 +90,19 @@ public class DATypeItemProvider extends IDNamingItemProvider { ...@@ -90,19 +90,19 @@ public class DATypeItemProvider extends IDNamingItemProvider {
} }
/** /**
* This adds a property descriptor for the Referred By DA feature. * This adds a property descriptor for the Referred By Abstract Data Attribute feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addReferredByDAPropertyDescriptor(Object object) { protected void addReferredByAbstractDataAttributePropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_DAType_ReferredByDA_feature"), getString("_UI_DAType_ReferredByAbstractDataAttribute_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DAType_ReferredByDA_feature", "_UI_DAType_type"), getString("_UI_PropertyDescriptor_description", "_UI_DAType_ReferredByAbstractDataAttribute_feature", "_UI_DAType_type"),
SclPackage.eINSTANCE.getDAType_ReferredByDA(), SclPackage.eINSTANCE.getDAType_ReferredByAbstractDataAttribute(),
true, true,
false, false,
true, true,
......
...@@ -61,35 +61,12 @@ public class DataAttributeItemProvider extends UnNamingItemProvider { ...@@ -61,35 +61,12 @@ public class DataAttributeItemProvider extends UnNamingItemProvider {
if (itemPropertyDescriptors == null) { if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addReferredByFCDAPropertyDescriptor(object);
addNamePropertyDescriptor(object); addNamePropertyDescriptor(object);
addReferredByExtRefPropertyDescriptor(object); addReferredByExtRefPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
/**
* This adds a property descriptor for the Referred By FCDA feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByFCDAPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DataAttribute_ReferredByFCDA_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DataAttribute_ReferredByFCDA_feature", "_UI_DataAttribute_type"),
SclPackage.eINSTANCE.getDataAttribute_ReferredByFCDA(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This adds a property descriptor for the Name feature. * This adds a property descriptor for the Name feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
......
...@@ -62,7 +62,6 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -62,7 +62,6 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addAccessControlPropertyDescriptor(object); addAccessControlPropertyDescriptor(object);
addReferredByFCDAPropertyDescriptor(object);
addNamePropertyDescriptor(object); addNamePropertyDescriptor(object);
addReferredByExtRefPropertyDescriptor(object); addReferredByExtRefPropertyDescriptor(object);
} }
...@@ -91,28 +90,6 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -91,28 +90,6 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Referred By FCDA feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByFCDAPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DataObject_ReferredByFCDA_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DataObject_ReferredByFCDA_feature", "_UI_DataObject_type"),
SclPackage.eINSTANCE.getDataObject_ReferredByFCDA(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This adds a property descriptor for the Name feature. * This adds a property descriptor for the Name feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
......
...@@ -68,9 +68,7 @@ public class FCDAItemProvider ...@@ -68,9 +68,7 @@ public class FCDAItemProvider
addLnClassPropertyDescriptor(object); addLnClassPropertyDescriptor(object);
addLnInstPropertyDescriptor(object); addLnInstPropertyDescriptor(object);
addPrefixPropertyDescriptor(object); addPrefixPropertyDescriptor(object);
addRefersToDataAttributePropertyDescriptor(object); addRefersToAbstractDataAttributePropertyDescriptor(object);
addRefersToDataObjectPropertyDescriptor(object);
addRefersToAnyLNPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -252,63 +250,19 @@ public class FCDAItemProvider ...@@ -252,63 +250,19 @@ public class FCDAItemProvider
} }
/** /**
* This adds a property descriptor for the Refers To Data Attribute feature. * This adds a property descriptor for the Refers To Abstract Data Attribute feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addRefersToDataAttributePropertyDescriptor(Object object) { protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_FCDA_RefersToDataAttribute_feature"), getString("_UI_FCDA_RefersToAbstractDataAttribute_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_FCDA_RefersToDataAttribute_feature", "_UI_FCDA_type"), getString("_UI_PropertyDescriptor_description", "_UI_FCDA_RefersToAbstractDataAttribute_feature", "_UI_FCDA_type"),
SclPackage.eINSTANCE.getFCDA_RefersToDataAttribute(), SclPackage.eINSTANCE.getFCDA_RefersToAbstractDataAttribute(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Refers To Data Object feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDataObjectPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_FCDA_RefersToDataObject_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_FCDA_RefersToDataObject_feature", "_UI_FCDA_type"),
SclPackage.eINSTANCE.getFCDA_RefersToDataObject(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Refers To Any LN feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToAnyLNPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_FCDA_RefersToAnyLN_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_FCDA_RefersToAnyLN_feature", "_UI_FCDA_type"),
SclPackage.eINSTANCE.getFCDA_RefersToAnyLN(),
true, true,
false, false,
true, true,
......
...@@ -360,6 +360,12 @@ ...@@ -360,6 +360,12 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="Val" ordered="false" upperBound="-1" <eStructuralFeatures xsi:type="ecore:EReference" name="Val" ordered="false" upperBound="-1"
eType="#//Val" unsettable="true" containment="true" resolveProxies="false" eType="#//Val" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//Val/AbstractDataAttribute"/> eOpposite="#//Val/AbstractDataAttribute"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToDAType" ordered="false"
eType="#//DAType" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DAType/ReferredByAbstractDataAttribute"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByFCDA" ordered="false"
upperBound="-1" eType="#//FCDA" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//FCDA/RefersToAbstractDataAttribute"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BDA" eSuperTypes="#//AbstractDataAttribute"> <eClassifiers xsi:type="ecore:EClass" name="BDA" eSuperTypes="#//AbstractDataAttribute">
<eStructuralFeatures xsi:type="ecore:EReference" name="DAType" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="DAType" ordered="false"
...@@ -368,9 +374,6 @@ ...@@ -368,9 +374,6 @@
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DA" eSuperTypes="#//AbstractDataAttribute #//AgDATrgOp"> <eClassifiers xsi:type="ecore:EClass" name="DA" eSuperTypes="#//AbstractDataAttribute #//AgDATrgOp">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" eType="#//FCEnum" unsettable="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="fc" eType="#//FCEnum" unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToDAType" ordered="false"
eType="#//DAType" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DAType/ReferredByDA"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="DOType" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="DOType" ordered="false"
eType="#//DOType" transient="true" unsettable="true" resolveProxies="false" eType="#//DOType" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DOType/DA"/> eOpposite="#//DOType/DA"/>
...@@ -384,9 +387,9 @@ ...@@ -384,9 +387,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="BDA" ordered="false" upperBound="-1" <eStructuralFeatures xsi:type="ecore:EReference" name="BDA" ordered="false" upperBound="-1"
eType="#//BDA" unsettable="true" containment="true" resolveProxies="false" eType="#//BDA" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//BDA/DAType"/> eOpposite="#//BDA/DAType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByDA" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByAbstractDataAttribute"
upperBound="-1" eType="#//DA" transient="true" unsettable="true" resolveProxies="false" ordered="false" upperBound="-1" eType="#//AbstractDataAttribute" transient="true"
eOpposite="#//DA/RefersToDAType"/> unsettable="true" resolveProxies="false" eOpposite="#//AbstractDataAttribute/RefersToDAType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="DataTypeTemplates" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="DataTypeTemplates" ordered="false"
eType="#//DataTypeTemplates" transient="true" unsettable="true" resolveProxies="false" eType="#//DataTypeTemplates" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DataTypeTemplates/DAType"/> eOpposite="#//DataTypeTemplates/DAType"/>
...@@ -605,9 +608,6 @@ ...@@ -605,9 +608,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="DataSet" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="DataSet" ordered="false"
upperBound="-1" eType="#//DataSet" unsettable="true" containment="true" resolveProxies="false" upperBound="-1" eType="#//DataSet" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//DataSet/AnyLN"/> eOpposite="#//DataSet/AnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByFCDA" ordered="false"
upperBound="-1" eType="#//FCDA" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//FCDA/RefersToAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false"
upperBound="-1" eType="#//ExtRef" transient="true" unsettable="true" resolveProxies="false" upperBound="-1" eType="#//ExtRef" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//ExtRef/RefersToAnyLN"/> eOpposite="#//ExtRef/RefersToAnyLN"/>
...@@ -912,18 +912,12 @@ ...@@ -912,18 +912,12 @@
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="" unsettable="true"/> defaultValueLiteral="" unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToDataAttribute"
ordered="false" eType="#//DataAttribute" transient="true" unsettable="true"
resolveProxies="false" eOpposite="#//DataAttribute/ReferredByFCDA"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToDataObject" ordered="false"
eType="#//DataObject" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DataObject/ReferredByFCDA"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="DataSet" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="DataSet" ordered="false"
eType="#//DataSet" transient="true" unsettable="true" resolveProxies="false" eType="#//DataSet" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DataSet/FCDA"/> eOpposite="#//DataSet/FCDA"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToAnyLN" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="RefersToAbstractDataAttribute"
eType="#//AnyLN" transient="true" unsettable="true" resolveProxies="false" ordered="false" upperBound="-1" eType="#//AbstractDataAttribute" transient="true"
eOpposite="#//AnyLN/ReferredByFCDA"/> unsettable="true" resolveProxies="false" eOpposite="#//AbstractDataAttribute/ReferredByFCDA"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FileHandling" eSuperTypes="#//SclObject"> <eClassifiers xsi:type="ecore:EClass" name="FileHandling" eSuperTypes="#//SclObject">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ftp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject" <eStructuralFeatures xsi:type="ecore:EAttribute" name="ftp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
...@@ -2037,9 +2031,6 @@ ...@@ -2037,9 +2031,6 @@
<eClassifiers xsi:type="ecore:EClass" name="DataObject" abstract="true" eSuperTypes="#//UnNaming"> <eClassifiers xsi:type="ecore:EClass" name="DataObject" abstract="true" eSuperTypes="#//UnNaming">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="accessControl" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessControl" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByFCDA" ordered="false"
upperBound="-1" eType="#//FCDA" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//FCDA/RefersToDataObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false"
...@@ -2047,9 +2038,6 @@ ...@@ -2047,9 +2038,6 @@
eOpposite="#//ExtRef/RefersToDataObject"/> eOpposite="#//ExtRef/RefersToDataObject"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DataAttribute" abstract="true" eSuperTypes="#//UnNaming"> <eClassifiers xsi:type="ecore:EClass" name="DataAttribute" abstract="true" eSuperTypes="#//UnNaming">
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByFCDA" ordered="false"
upperBound="-1" eType="#//FCDA" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//FCDA/RefersToDataAttribute"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByExtRef" ordered="false"
......
...@@ -259,20 +259,21 @@ ...@@ -259,20 +259,21 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AbstractDataAttribute/valKind"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AbstractDataAttribute/valKind"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/RefersToEnumType"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/RefersToEnumType"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/Val"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/Val"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/RefersToDAType"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AbstractDataAttribute/ReferredByFCDA"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//BDA"> <genClasses ecoreClass="SCL.ecore#//BDA">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//BDA/DAType"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//BDA/DAType"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//DA"> <genClasses ecoreClass="SCL.ecore#//DA">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DA/fc"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DA/fc"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DA/RefersToDAType"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//DA/DOType"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//DA/DOType"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DA/ProtNs"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DA/ProtNs"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//DAType"> <genClasses ecoreClass="SCL.ecore#//DAType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DAType/iedType"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DAType/iedType"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/BDA"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/BDA"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/ReferredByDA"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/ReferredByAbstractDataAttribute"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//DAType/DataTypeTemplates"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//DAType/DataTypeTemplates"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/ProtNs"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/ProtNs"/>
</genClasses> </genClasses>
...@@ -364,7 +365,6 @@ ...@@ -364,7 +365,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReportControl"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReportControl"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/LogControl"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/LogControl"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/DataSet"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/DataSet"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByFCDA"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByExtRef"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByExtRef"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByClientLN"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByClientLN"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByLogControl"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByLogControl"/>
...@@ -520,10 +520,8 @@ ...@@ -520,10 +520,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/lnClass"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/lnClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/lnInst"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/lnInst"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/prefix"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FCDA/prefix"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/RefersToDataAttribute"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/RefersToDataObject"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/DataSet"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/DataSet"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/RefersToAnyLN"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//FCDA/RefersToAbstractDataAttribute"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//FileHandling"> <genClasses ecoreClass="SCL.ecore#//FileHandling">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FileHandling/ftp"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//FileHandling/ftp"/>
...@@ -1000,12 +998,10 @@ ...@@ -1000,12 +998,10 @@
<genClasses image="false" ecoreClass="SCL.ecore#//ExplicitLinkResolver"/> <genClasses image="false" ecoreClass="SCL.ecore#//ExplicitLinkResolver"/>
<genClasses image="false" ecoreClass="SCL.ecore#//DataObject"> <genClasses image="false" ecoreClass="SCL.ecore#//DataObject">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataObject/accessControl"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataObject/accessControl"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataObject/ReferredByFCDA"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataObject/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataObject/name"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataObject/ReferredByExtRef"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataObject/ReferredByExtRef"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="SCL.ecore#//DataAttribute"> <genClasses image="false" ecoreClass="SCL.ecore#//DataAttribute">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataAttribute/ReferredByFCDA"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataAttribute/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//DataAttribute/name"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataAttribute/ReferredByExtRef"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//DataAttribute/ReferredByExtRef"/>
</genClasses> </genClasses>
......
...@@ -37,6 +37,8 @@ import org.eclipse.emf.common.util.EList; ...@@ -37,6 +37,8 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getValKind <em>Val Kind</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getValKind <em>Val Kind</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToEnumType <em>Refers To Enum Type</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToEnumType <em>Refers To Enum Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getVal <em>Val</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getVal <em>Val</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}</li>