Commit fade77f8 authored by Dominique Marcadet's avatar Dominique Marcadet

move RefersToDAType from DA to AbstractDataAttribute

parent 9679b14d
......@@ -1094,3 +1094,5 @@ _UI_AgDATrgOp_qchg_feature = Qchg
_UI_AgVirtual_virtual_feature = Virtual
_UI_AgSmvOpts_dataRef_feature = Data Ref
_UI_AgOptFields_segmentation_feature = Segmentation
_UI_AbstractDataAttribute_RefersToDAType_feature = Refers To DA Type
_UI_DAType_ReferredByAbstractDataAttribute_feature = Referred By Abstract Data Attribute
......@@ -68,6 +68,7 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
addValImportPropertyDescriptor(object);
addValKindPropertyDescriptor(object);
addRefersToEnumTypePropertyDescriptor(object);
addRefersToDATypePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -226,6 +227,28 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
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 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
......
......@@ -65,7 +65,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
addDupdPropertyDescriptor(object);
addQchgPropertyDescriptor(object);
addFcPropertyDescriptor(object);
addRefersToDATypePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -158,28 +157,6 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
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
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
......
......@@ -62,7 +62,7 @@ public class DATypeItemProvider extends IDNamingItemProvider {
super.getPropertyDescriptors(object);
addIedTypePropertyDescriptor(object);
addReferredByDAPropertyDescriptor(object);
addReferredByAbstractDataAttributePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -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 -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByDAPropertyDescriptor(Object object) {
protected void addReferredByAbstractDataAttributePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DAType_ReferredByDA_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DAType_ReferredByDA_feature", "_UI_DAType_type"),
SclPackage.eINSTANCE.getDAType_ReferredByDA(),
getString("_UI_DAType_ReferredByAbstractDataAttribute_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DAType_ReferredByAbstractDataAttribute_feature", "_UI_DAType_type"),
SclPackage.eINSTANCE.getDAType_ReferredByAbstractDataAttribute(),
true,
false,
true,
......
......@@ -360,6 +360,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="Val" ordered="false" upperBound="-1"
eType="#//Val" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//Val/AbstractDataAttribute"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToDAType" ordered="false"
eType="#//DAType" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DAType/ReferredByAbstractDataAttribute"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="BDA" eSuperTypes="#//AbstractDataAttribute">
<eStructuralFeatures xsi:type="ecore:EReference" name="DAType" ordered="false"
......@@ -368,9 +371,6 @@
</eClassifiers>
<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: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"
eType="#//DOType" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DOType/DA"/>
......@@ -384,9 +384,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="BDA" ordered="false" upperBound="-1"
eType="#//BDA" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//BDA/DAType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByDA" ordered="false"
upperBound="-1" eType="#//DA" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DA/RefersToDAType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByAbstractDataAttribute"
ordered="false" upperBound="-1" eType="#//AbstractDataAttribute" transient="true"
unsettable="true" resolveProxies="false" eOpposite="#//AbstractDataAttribute/RefersToDAType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="DataTypeTemplates" ordered="false"
eType="#//DataTypeTemplates" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//DataTypeTemplates/DAType"/>
......
......@@ -259,20 +259,20 @@
<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 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"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//BDA">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//BDA/DAType"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//DA">
<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" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DA/ProtNs"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//DAType">
<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 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" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//DAType/ProtNs"/>
</genClasses>
......
......@@ -37,6 +37,7 @@ 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#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#getRefersToDAType <em>Refers To DA Type</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAbstractDataAttribute()
......@@ -464,4 +465,55 @@ public interface AbstractDataAttribute extends DataAttribute {
*/
boolean isSetVal();
/**
* Returns the value of the '<em><b>Refers To DA Type</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Refers To DA Type</em>' reference.
* @see #isSetRefersToDAType()
* @see #unsetRefersToDAType()
* @see #setRefersToDAType(DAType)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAbstractDataAttribute_RefersToDAType()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute
* @model opposite="ReferredByAbstractDataAttribute" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
DAType getRefersToDAType();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To DA Type</em>' reference.
* @see #isSetRefersToDAType()
* @see #unsetRefersToDAType()
* @see #getRefersToDAType()
* @generated
*/
void setRefersToDAType(DAType value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetRefersToDAType()
* @see #getRefersToDAType()
* @see #setRefersToDAType(DAType)
* @generated
*/
void unsetRefersToDAType();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}' reference is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To DA Type</em>' reference is set.
* @see #unsetRefersToDAType()
* @see #getRefersToDAType()
* @see #setRefersToDAType(DAType)
* @generated
*/
boolean isSetRefersToDAType();
} // AbstractDataAttribute
......@@ -30,7 +30,6 @@ import org.eclipse.emf.common.util.EList;
* </p>
* <ul>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getFc <em>Fc</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getDOType <em>DO Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getProtNs <em>Prot Ns</em>}</li>
* </ul>
......@@ -96,61 +95,6 @@ public interface DA extends AbstractDataAttribute, AgDATrgOp {
*/
boolean isSetFc();
/**
* Returns the value of the '<em><b>Refers To DA Type</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA <em>Referred By DA</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Refers To DA Type</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Refers To DA Type</em>' reference.
* @see #isSetRefersToDAType()
* @see #unsetRefersToDAType()
* @see #setRefersToDAType(DAType)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getDA_RefersToDAType()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA
* @model opposite="ReferredByDA" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
DAType getRefersToDAType();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To DA Type</em>' reference.
* @see #isSetRefersToDAType()
* @see #unsetRefersToDAType()
* @see #getRefersToDAType()
* @generated
*/
void setRefersToDAType(DAType value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetRefersToDAType()
* @see #getRefersToDAType()
* @see #setRefersToDAType(DAType)
* @generated
*/
void unsetRefersToDAType();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}' reference is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To DA Type</em>' reference is set.
* @see #unsetRefersToDAType()
* @see #getRefersToDAType()
* @see #setRefersToDAType(DAType)
* @generated
*/
boolean isSetRefersToDAType();
/**
* Returns the value of the '<em><b>DO Type</b></em>' container reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType#getDA <em>DA</em>}'.
......
......@@ -31,7 +31,7 @@ import org.eclipse.emf.common.util.EList;
* <ul>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getIedType <em>Ied Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getBDA <em>BDA</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA <em>Referred By DA</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getDataTypeTemplates <em>Data Type Templates</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getProtNs <em>Prot Ns</em>}</li>
* </ul>
......@@ -136,45 +136,41 @@ public interface DAType extends IDNaming {
boolean isSetBDA();
/**
* Returns the value of the '<em><b>Referred By DA</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}'.
* Returns the value of the '<em><b>Referred By Abstract Data Attribute</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Referred By DA</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Referred By DA</em>' reference list.
* @see #isSetReferredByDA()
* @see #unsetReferredByDA()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getDAType_ReferredByDA()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType
* @return the value of the '<em>Referred By Abstract Data Attribute</em>' reference list.
* @see #isSetReferredByAbstractDataAttribute()
* @see #unsetReferredByAbstractDataAttribute()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getDAType_ReferredByAbstractDataAttribute()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType
* @model opposite="RefersToDAType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<DA> getReferredByDA();
EList<AbstractDataAttribute> getReferredByAbstractDataAttribute();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA <em>Referred By DA</em>}' reference list.
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetReferredByDA()
* @see #getReferredByDA()
* @see #isSetReferredByAbstractDataAttribute()
* @see #getReferredByAbstractDataAttribute()
* @generated
*/
void unsetReferredByDA();
void unsetReferredByAbstractDataAttribute();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA <em>Referred By DA</em>}' reference list is set.
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Referred By DA</em>' reference list is set.
* @see #unsetReferredByDA()
* @see #getReferredByDA()
* @return whether the value of the '<em>Referred By Abstract Data Attribute</em>' reference list is set.
* @see #unsetReferredByAbstractDataAttribute()
* @see #getReferredByAbstractDataAttribute()
* @generated
*/
boolean isSetReferredByDA();
boolean isSetReferredByAbstractDataAttribute();
/**
* Returns the value of the '<em><b>Data Type Templates</b></em>' container reference.
......
......@@ -4431,6 +4431,15 @@ public interface SclPackage extends EPackage {
*/
int ABSTRACT_DATA_ATTRIBUTE__VAL = DATA_ATTRIBUTE_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Refers To DA Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE = DATA_ATTRIBUTE_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>Abstract Data Attribute</em>' class.
* <!-- begin-user-doc -->
......@@ -4438,7 +4447,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT = DATA_ATTRIBUTE_FEATURE_COUNT + 8;
int ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT = DATA_ATTRIBUTE_FEATURE_COUNT + 9;
/**
* The number of operations of the '<em>Abstract Data Attribute</em>' class.
......@@ -4602,6 +4611,15 @@ public interface SclPackage extends EPackage {
*/
int BDA__VAL = ABSTRACT_DATA_ATTRIBUTE__VAL;
/**
* The feature id for the '<em><b>Refers To DA Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int BDA__REFERS_TO_DA_TYPE = ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE;
/**
* The feature id for the '<em><b>DA Type</b></em>' container reference.
* <!-- begin-user-doc -->
......@@ -4782,6 +4800,15 @@ public interface SclPackage extends EPackage {
*/
int DA__VAL = ABSTRACT_DATA_ATTRIBUTE__VAL;
/**
* The feature id for the '<em><b>Refers To DA Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int DA__REFERS_TO_DA_TYPE = ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE;
/**
* The feature id for the '<em><b>Dchg</b></em>' attribute.
* <!-- begin-user-doc -->
......@@ -4818,15 +4845,6 @@ public interface SclPackage extends EPackage {
*/
int DA__FC = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Refers To DA Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int DA__REFERS_TO_DA_TYPE = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>DO Type</b></em>' container reference.
* <!-- begin-user-doc -->
......@@ -4834,7 +4852,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int DA__DO_TYPE = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 5;
int DA__DO_TYPE = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Prot Ns</b></em>' containment reference list.
......@@ -4843,7 +4861,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int DA__PROT_NS = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 6;
int DA__PROT_NS = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 5;
/**
* The number of structural features of the '<em>DA</em>' class.
......@@ -4852,7 +4870,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int DA_FEATURE_COUNT = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 7;
int DA_FEATURE_COUNT = ABSTRACT_DATA_ATTRIBUTE_FEATURE_COUNT + 6;
/**
* The number of operations of the '<em>DA</em>' class.
......@@ -4945,13 +4963,13 @@ public interface SclPackage extends EPackage {
int DA_TYPE__BDA = ID_NAMING_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Referred By DA</b></em>' reference list.
* The feature id for the '<em><b>Referred By Abstract Data Attribute</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int DA_TYPE__REFERRED_BY_DA = ID_NAMING_FEATURE_COUNT + 2;
int DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE = ID_NAMING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Data Type Templates</b></em>' container reference.
......@@ -20076,6 +20094,17 @@ public interface SclPackage extends EPackage {
*/
EReference getAbstractDataAttribute_Val();
/**
* Returns the meta object for the reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Refers To DA Type</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType()
* @see #getAbstractDataAttribute()
* @generated
*/
EReference getAbstractDataAttribute_RefersToDAType();
/**
* Returns the meta object for class '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.BDA <em>BDA</em>}'.
* <!-- begin-user-doc -->
......@@ -20118,17 +20147,6 @@ public interface SclPackage extends EPackage {
*/
EAttribute getDA_Fc();
/**
* Returns the meta object for the reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType <em>Refers To DA Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Refers To DA Type</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getRefersToDAType()
* @see #getDA()
* @generated
*/
EReference getDA_RefersToDAType();
/**
* Returns the meta object for the container reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getDOType <em>DO Type</em>}'.
* <!-- begin-user-doc -->
......@@ -20184,15 +20202,15 @@ public interface SclPackage extends EPackage {
EReference getDAType_BDA();
/**
* Returns the meta object for the reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA <em>Referred By DA</em>}'.
* Returns the meta object for the reference list '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference list '<em>Referred By DA</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByDA()
* @return the meta object for the reference list '<em>Referred By Abstract Data Attribute</em>'.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute()
* @see #getDAType()
* @generated
*/
EReference getDAType_ReferredByDA();
EReference getDAType_ReferredByAbstractDataAttribute();
/**
* Returns the meta object for the container reference '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getDataTypeTemplates <em>Data Type Templates</em>}'.
......
......@@ -18,6 +18,7 @@
*/
package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
......@@ -31,7 +32,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.InternalEList;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.BDA;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.DA;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.ProtNs;
......@@ -47,7 +47,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
* <ul>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getIedType <em>Ied Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getBDA <em>BDA</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getReferredByDA <em>Referred By DA</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getDataTypeTemplates <em>Data Type Templates</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.DATypeImpl#getProtNs <em>Prot Ns</em>}</li>
* </ul>
......@@ -95,14 +95,14 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
protected EList<BDA> bda;
/**
* The cached value of the '{@link #getReferredByDA() <em>Referred By DA</em>}' reference list.
* The cached value of the '{@link #getReferredByAbstractDataAttribute() <em>Referred By Abstract Data Attribute</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getReferredByDA()
* @see #getReferredByAbstractDataAttribute()
* @generated
* @ordered
*/
protected EList<DA> referredByDA;
protected EList<AbstractDataAttribute> referredByAbstractDataAttribute;
/**
* The cached value of the '{@link #getProtNs() <em>Prot Ns</em>}' containment reference list.
......@@ -222,11 +222,11 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
* @generated
*/
@Override
public EList<DA> getReferredByDA() {
if (referredByDA == null) {
referredByDA = new EObjectWithInverseEList.Unsettable<DA>(DA.class, this, SclPackage.DA_TYPE__REFERRED_BY_DA, SclPackage.DA__REFERS_TO_DA_TYPE);
public EList<AbstractDataAttribute> getReferredByAbstractDataAttribute() {
if (referredByAbstractDataAttribute == null) {
referredByAbstractDataAttribute = new EObjectWithInverseEList.Unsettable<AbstractDataAttribute>(AbstractDataAttribute.class, this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE);
}
return referredByDA;
return referredByAbstractDataAttribute;
}
/**
......@@ -235,8 +235,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
* @generated
*/
@Override
public void unsetReferredByDA() {
if (referredByDA != null) ((InternalEList.Unsettable<?>)referredByDA).unset();
public void unsetReferredByAbstractDataAttribute() {
if (referredByAbstractDataAttribute != null) ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).unset();
}
/**
......@@ -245,8 +245,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
* @generated
*/
@Override
public boolean isSetReferredByDA() {
return referredByDA != null && ((InternalEList.Unsettable<?>)referredByDA).isSet();
public boolean isSetReferredByAbstractDataAttribute() {
return referredByAbstractDataAttribute != null && ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).isSet();
}
/**
......@@ -336,8 +336,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
switch (featureID) {
case SclPackage.DA_TYPE__BDA:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getBDA()).basicAdd(otherEnd, msgs);
case SclPackage.DA_TYPE__REFERRED_BY_DA:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByDA()).basicAdd(otherEnd, msgs);
case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAbstractDataAttribute()).basicAdd(otherEnd, msgs);
case SclPackage.DA_TYPE__DATA_TYPE_TEMPLATES:
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
......@@ -358,8 +358,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
switch (featureID) {
case SclPackage.DA_TYPE__BDA:
return ((InternalEList<?>)getBDA()).basicRemove(otherEnd, msgs);
case SclPackage.DA_TYPE__REFERRED_BY_DA:
return ((InternalEList<?>)getReferredByDA()).basicRemove(otherEnd, msgs);
case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
return ((InternalEList<?>)getReferredByAbstractDataAttribute()).basicRemove(otherEnd, msgs);
case SclPackage.DA_TYPE__DATA_TYPE_TEMPLATES:
return basicSetDataTypeTemplates(null, msgs);
case SclPackage.DA_TYPE__PROT_NS:
......@@ -394,8 +394,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
return getIedType();
case SclPackage.DA_TYPE__BDA:
return getBDA();