Commit 1997d3e8 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '39-rewrite-doresolvelinks-using-stream-api' into 'master'

Resolve "rewrite doResolveLinks using stream API"

Closes #39

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!35
parents cd7b318f 561f96a9
......@@ -1106,3 +1106,13 @@ _UI_ExtRef_RefersToDOType_feature = Refers To DO Type
_UI_ExtRef_RefersToControlBlock_feature = Refers To Control Block
_UI_Control_ReferredByExtRef_feature = Referred By Ext Ref
_UI_ExtRef_RefersToControl_feature = Refers To Control
_UI_ConnectedAP_ControlBlock_feature = Control Block
_UI_AnyLN_ControlWithTriggerOpt_feature = Control With Trigger Opt
_UI_AnyLN_Control_feature = Control
_UI_LN0_ControlWithIEDName_feature = Control With IED Name
_UI_AnyLN_ReferredByIEDName_feature = Referred By IED Name
_UI_IED_ReferredByIEDName_feature = Referred By IED Name
_UI_IEDName_RefersToIed_feature = Refers To Ied
_UI_IEDName_RefersToLDevice_feature = Refers To LDevice
_UI_LDevice_ReferredByIEDName_feature = Referred By IED Name
_UI_IEDName_RefersToIED_feature = Refers To IED
......@@ -68,7 +68,7 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
addReferredByClientLNPropertyDescriptor(object);
addReferredByLogControlPropertyDescriptor(object);
addReferredByAssociationPropertyDescriptor(object);
addReferredIEDNamePropertyDescriptor(object);
addReferredByIEDNamePropertyDescriptor(object);
addReferredByLNodePropertyDescriptor(object);
}
return itemPropertyDescriptors;
......@@ -229,19 +229,19 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
}
/**
* This adds a property descriptor for the Referred IED Name feature.
* This adds a property descriptor for the Referred By IED Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredIEDNamePropertyDescriptor(Object object) {
protected void addReferredByIEDNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AnyLN_ReferredIEDName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredIEDName_feature", "_UI_AnyLN_type"),
SclPackage.eINSTANCE.getAnyLN_ReferredIEDName(),
getString("_UI_AnyLN_ReferredByIEDName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByIEDName_feature", "_UI_AnyLN_type"),
SclPackage.eINSTANCE.getAnyLN_ReferredByIEDName(),
true,
false,
true,
......@@ -290,6 +290,7 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_ReportControl());
childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_LogControl());
childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_DataSet());
childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_Control());
}
return childrenFeatures;
}
......@@ -354,6 +355,7 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
case SclPackage.ANY_LN__REPORT_CONTROL:
case SclPackage.ANY_LN__LOG_CONTROL:
case SclPackage.ANY_LN__DATA_SET:
case SclPackage.ANY_LN__CONTROL:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
......
......@@ -173,6 +173,7 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_PhysConn());
childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_GSE());
childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_SMV());
childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_ControlBlock());
}
return childrenFeatures;
}
......@@ -237,6 +238,7 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
case SclPackage.CONNECTED_AP__PHYS_CONN:
case SclPackage.CONNECTED_AP__GSE:
case SclPackage.CONNECTED_AP__SMV:
case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
......
......@@ -63,7 +63,6 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
addCbNamePropertyDescriptor(object);
addLdInstPropertyDescriptor(object);
addRefersToLDevicePropertyDescriptor(object);
addRefersToControlWithIEDNamePropertyDescriptor(object);
}
return itemPropertyDescriptors;
......@@ -113,28 +112,6 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
null));
}
/**
* This adds a property descriptor for the Refers To LDevice feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToLDevicePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ControlBlock_RefersToLDevice_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_ControlBlock_RefersToLDevice_feature", "_UI_ControlBlock_type"),
SclPackage.eINSTANCE.getControlBlock_RefersToLDevice(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Refers To Control With IED Name feature.
* <!-- begin-user-doc -->
......
......@@ -70,6 +70,7 @@ public class IEDItemProvider extends UnNamingItemProvider {
addTypePropertyDescriptor(object);
addNamePropertyDescriptor(object);
addOriginalSclReleasePropertyDescriptor(object);
addReferredByIEDNamePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -272,6 +273,28 @@ public class IEDItemProvider extends UnNamingItemProvider {
null));
}
/**
* This adds a property descriptor for the Referred By IED Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByIEDNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_IED_ReferredByIEDName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_IED_ReferredByIEDName_feature", "_UI_IED_type"),
SclPackage.eINSTANCE.getIED_ReferredByIEDName(),
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
......
......@@ -67,6 +67,8 @@ public class IEDNameItemProvider
addPrefixPropertyDescriptor(object);
addRefersToAnyLNPropertyDescriptor(object);
addValuePropertyDescriptor(object);
addRefersToIEDPropertyDescriptor(object);
addRefersToLDevicePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -225,6 +227,50 @@ public class IEDNameItemProvider
null));
}
/**
* This adds a property descriptor for the Refers To IED feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToIEDPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_IEDName_RefersToIED_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToIED_feature", "_UI_IEDName_type"),
SclPackage.eINSTANCE.getIEDName_RefersToIED(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Refers To LDevice feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToLDevicePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_IEDName_RefersToLDevice_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToLDevice_feature", "_UI_IEDName_type"),
SclPackage.eINSTANCE.getIEDName_RefersToLDevice(),
true,
false,
true,
null,
null,
null));
}
/**
* This returns IEDName.gif.
* <!-- begin-user-doc -->
......
......@@ -63,7 +63,7 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
addInstPropertyDescriptor(object);
addLdNamePropertyDescriptor(object);
addReferredByControlBlockPropertyDescriptor(object);
addReferredByIEDNamePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -113,19 +113,19 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
}
/**
* This adds a property descriptor for the Referred By Control Block feature.
* This adds a property descriptor for the Referred By IED Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByControlBlockPropertyDescriptor(Object object) {
protected void addReferredByIEDNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LDevice_ReferredByControlBlock_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LDevice_ReferredByControlBlock_feature", "_UI_LDevice_type"),
SclPackage.eINSTANCE.getLDevice_ReferredByControlBlock(),
getString("_UI_LDevice_ReferredByIEDName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LDevice_ReferredByIEDName_feature", "_UI_LDevice_type"),
SclPackage.eINSTANCE.getLDevice_ReferredByIEDName(),
true,
false,
true,
......
......@@ -213,18 +213,19 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//ConnectedAP/PhysConn"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//ConnectedAP/GSE"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//ConnectedAP/SMV"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute SCL.ecore#//ConnectedAP/ControlBlock"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//ControlBlock">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//ControlBlock/cbName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//ControlBlock/ldInst"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//ControlBlock/Address"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//ControlBlock/RefersToLDevice"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//ControlBlock/RefersToControlWithIEDName"/>
<genOperations ecoreOperation="SCL.ecore#//ControlBlock/getConnectedAP"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//GSE">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//GSE/ConnectedAP"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//GSE/MinTime"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//GSE/MaxTime"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//GSE/ConnectedAP"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//P">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//P/Address"/>
......@@ -370,8 +371,11 @@
<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/ReferredByAssociation"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredIEDName"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByIEDName"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//AnyLN/ReferredByLNode"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//AnyLN/ControlWithTriggerOpt"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute SCL.ecore#//AnyLN/Control"/>
<genOperations ecoreOperation="SCL.ecore#//AnyLN/getLDevice"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//Association">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Association/associationID"/>
......@@ -445,6 +449,7 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Control/RefersToDataSet"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Control/name"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Control/ReferredByExtRef"/>
<genOperations ecoreOperation="SCL.ecore#//Control/getAnyLN"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//ControlWithIEDName">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//ControlWithIEDName/confRev"/>
......@@ -586,6 +591,7 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//IED/SCL"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IED/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IED/originalSclRelease"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//IED/ReferredByIEDName"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//IEDName">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IEDName/apRef"/>
......@@ -596,6 +602,8 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//IEDName/ControlWithIEDName"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//IEDName/RefersToAnyLN"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IEDName/value"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//IEDName/RefersToIED"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//IEDName/RefersToLDevice"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//Inputs">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Inputs/AnyLN"/>
......@@ -613,12 +621,12 @@
<genClasses ecoreClass="SCL.ecore#//LDevice">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LDevice/inst"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LDevice/ldName"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/ReferredByControlBlock"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/AccessControl"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/Server"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LDevice/AnyLN"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/LN0"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/LN"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/ReferredByIEDName"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//LN">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LN/prefix"/>
......@@ -630,6 +638,7 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LN0/LDevice"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LN0/SampledValueControl"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LN0/SettingControl"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LN0/ControlWithIEDName"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//Log">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Log/AnyLN"/>
......
......@@ -19,6 +19,7 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
/**
* <!-- begin-user-doc -->
......@@ -42,8 +43,10 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByClientLN <em>Referred By Client LN</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLogControl <em>Referred By Log Control</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByAssociation <em>Referred By Association</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredIEDName <em>Referred IED Name</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByIEDName <em>Referred By IED Name</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLNode <em>Referred By LNode</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControlWithTriggerOpt <em>Control With Trigger Opt</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControl <em>Control</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN()
......@@ -417,7 +420,8 @@ public interface AnyLN extends UnNaming {
* @see #unsetReportControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_ReportControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.ReportControl#getAnyLN
* @model opposite="AnyLN" containment="true" unsettable="true" ordered="false"
* @model opposite="AnyLN" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithTriggerOpt'"
* @generated
*/
EList<ReportControl> getReportControl();
......@@ -458,7 +462,8 @@ public interface AnyLN extends UnNaming {
* @see #unsetLogControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_LogControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LogControl#getAnyLN
* @model opposite="AnyLN" containment="true" unsettable="true" ordered="false"
* @model opposite="AnyLN" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithTriggerOpt'"
* @generated
*/
EList<LogControl> getLogControl();
......@@ -649,45 +654,41 @@ public interface AnyLN extends UnNaming {
boolean isSetReferredByAssociation();
/**
* Returns the value of the '<em><b>Referred IED Name</b></em>' reference list.
* Returns the value of the '<em><b>Referred By IED Name</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getRefersToAnyLN <em>Refers To Any LN</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Referred IED Name</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 IED Name</em>' reference list.
* @see #isSetReferredIEDName()
* @see #unsetReferredIEDName()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_ReferredIEDName()
* @return the value of the '<em>Referred By IED Name</em>' reference list.
* @see #isSetReferredByIEDName()
* @see #unsetReferredByIEDName()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_ReferredByIEDName()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getRefersToAnyLN
* @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<IEDName> getReferredIEDName();
EList<IEDName> getReferredByIEDName();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredIEDName <em>Referred IED Name</em>}' reference list.
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByIEDName <em>Referred By IED Name</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetReferredIEDName()
* @see #getReferredIEDName()
* @see #isSetReferredByIEDName()
* @see #getReferredByIEDName()
* @generated
*/
void unsetReferredIEDName();
void unsetReferredByIEDName();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredIEDName <em>Referred IED Name</em>}' reference list is set.
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByIEDName <em>Referred By IED Name</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Referred IED Name</em>' reference list is set.
* @see #unsetReferredIEDName()
* @see #getReferredIEDName()
* @return whether the value of the '<em>Referred By IED Name</em>' reference list is set.
* @see #unsetReferredByIEDName()
* @see #getReferredByIEDName()
* @generated
*/
boolean isSetReferredIEDName();
boolean isSetReferredByIEDName();
/**
* Returns the value of the '<em><b>Referred By LNode</b></em>' reference list.
......@@ -726,6 +727,78 @@ public interface AnyLN extends UnNaming {
*/
boolean isSetReferredByLNode();
/**
* Returns the value of the '<em><b>Control With Trigger Opt</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Control With Trigger Opt</em>' attribute list.
* @see #isSetControlWithTriggerOpt()
* @see #unsetControlWithTriggerOpt()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_ControlWithTriggerOpt()
* @model unsettable="true" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" volatile="true" ordered="false"
* extendedMetaData="kind='group' group='#Control'"
* @generated
*/
FeatureMap getControlWithTriggerOpt();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControlWithTriggerOpt <em>Control With Trigger Opt</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetControlWithTriggerOpt()
* @see #getControlWithTriggerOpt()
* @generated
*/
void unsetControlWithTriggerOpt();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControlWithTriggerOpt <em>Control With Trigger Opt</em>}' attribute list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Control With Trigger Opt</em>' attribute list is set.
* @see #unsetControlWithTriggerOpt()
* @see #getControlWithTriggerOpt()
* @generated
*/
boolean isSetControlWithTriggerOpt();
/**
* Returns the value of the '<em><b>Control</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Control</em>' attribute list.
* @see #isSetControl()
* @see #unsetControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_Control()
* @model unsettable="true" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" ordered="false"
* extendedMetaData="kind='group'"
* @generated
*/
FeatureMap getControl();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControl <em>Control</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetControl()
* @see #getControl()
* @generated
*/
void unsetControl();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getControl <em>Control</em>}' attribute list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Control</em>' attribute list is set.
* @see #unsetControl()
* @see #getControl()
* @generated
*/
boolean isSetControl();
LDevice getLDevice();
} // AnyLN
......@@ -19,6 +19,7 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
/**
* <!-- begin-user-doc -->
......@@ -38,6 +39,7 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getPhysConn <em>Phys Conn</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getGSE <em>GSE</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getSMV <em>SMV</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getControlBlock <em>Control Block</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectedAP()
......@@ -398,7 +400,8 @@ public interface ConnectedAP extends UnNaming {
* @see #unsetGSE()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectedAP_GSE()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE#getConnectedAP
* @model opposite="ConnectedAP" containment="true" unsettable="true" ordered="false"
* @model opposite="ConnectedAP" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlBlock'"
* @generated
*/
EList<GSE> getGSE();
......@@ -439,7 +442,8 @@ public interface ConnectedAP extends UnNaming {
* @see #unsetSMV()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectedAP_SMV()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SMV#getConnectedAP
* @model opposite="ConnectedAP" containment="true" unsettable="true" ordered="false"
* @model opposite="ConnectedAP" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlBlock'"
* @generated
*/
EList<SMV> getSMV();
......@@ -465,4 +469,17 @@ public interface ConnectedAP extends UnNaming {
*/
boolean isSetSMV();
/**
* Returns the value of the '<em><b>Control Block</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Control Block</em>' attribute list.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectedAP_ControlBlock()
* @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" ordered="false"
* extendedMetaData="kind='group'"
* @generated
*/
FeatureMap getControlBlock();
} // ConnectedAP
......@@ -30,7 +30,6 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getCbName <em>Cb Name</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getLdInst <em>Ld Inst</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getAddress <em>Address</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToLDevice <em>Refers To LDevice</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToControlWithIEDName <em>Refers To Control With IED Name</em>}</li>
* </ul>
*
......@@ -200,61 +199,6 @@ public interface ControlBlock extends UnNaming {
*/
boolean isSetAddress();
/**
* Returns the value of the '<em><b>Refers To LDevice</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getReferredByControlBlock <em>Referred By Control Block</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Refers To LDevice</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 LDevice</em>' reference.
* @see #isSetRefersToLDevice()
* @see #unsetRefersToLDevice()
* @see #setRefersToLDevice(LDevice)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getControlBlock_RefersToLDevice()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getReferredByControlBlock
* @model opposite="ReferredByControlBlock" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
LDevice getRefersToLDevice();
/**
* Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToLDevice <em>Refers To LDevice</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Refers To LDevice</em>' reference.
* @see #isSetRefersToLDevice()
* @see #unsetRefersToLDevice()
* @see #getRefersToLDevice()
* @generated
*/
void setRefersToLDevice(LDevice value);
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToLDevice <em>Refers To LDevice</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetRefersToLDevice()
* @see #getRefersToLDevice()
* @see #setRefersToLDevice(LDevice)
* @generated
*/
void unsetRefersToLDevice();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToLDevice <em>Refers To LDevice</em>}' reference is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Refers To LDevice</em>' reference is set.
* @see #unsetRefersToLDevice()
* @see #getRefersToLDevice()
* @see #setRefersToLDevice(LDevice)
* @generated
*/
boolean isSetRefersToLDevice();
/**
* Returns the value of the '<em><b>Refers To Control With IED Name</b></em>' reference.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithIEDName#getReferredByControlBlock <em>Referred By Control Block</em>}'.
......@@ -310,4 +254,12 @@ public interface ControlBlock extends UnNaming {
*/
boolean isSetRefersToControlWithIEDName();
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model kind="operation"
* @generated
*/