Commit f7648ffa authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '14-name-of-lnode-ied-link-is-incorrect' into 'master'

Resolve "Name of LNode <> IED link is incorrect"

Closes #14

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!29
parents 87695a9c 7641b18d
......@@ -1051,3 +1051,6 @@ _UI_ConnectivityNode_ReferredByTerminal_feature = Referred By Terminal
_UI_Terminal_RefersToConnectivityNode_feature = Refers To Connectivity Node
_UI_Log_ReferredByLogControl_feature = Referred By Log Control
_UI_LogControl_RefersToLog_feature = Refers To Log
_UI_AnyLN_ReferredByLNode_feature = Referred By LNode
_UI_LDevice_AnyLN_feature = Any LN
_UI_LNode_RefersToAnyLN_feature = Refers To Any LN
......@@ -71,6 +71,7 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
addReferredByLogControlPropertyDescriptor(object);
addReferredByAssociationPropertyDescriptor(object);
addReferredIEDNamePropertyDescriptor(object);
addReferredByLNodePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -295,6 +296,28 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
null));
}
/**
* This adds a property descriptor for the Referred By LNode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByLNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AnyLN_ReferredByLNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByLNode_feature", "_UI_AnyLN_type"),
SclPackage.eINSTANCE.getAnyLN_ReferredByLNode(),
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
......
......@@ -68,7 +68,6 @@ public class IEDItemProvider extends UnNamingItemProvider {
addOriginalSclVersionPropertyDescriptor(object);
addOwnerPropertyDescriptor(object);
addTypePropertyDescriptor(object);
addLNodePropertyDescriptor(object);
addNamePropertyDescriptor(object);
addOriginalSclReleasePropertyDescriptor(object);
}
......@@ -229,28 +228,6 @@ public class IEDItemProvider extends UnNamingItemProvider {
null));
}
/**
* This adds a property descriptor for the LNode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addLNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_IED_LNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_IED_LNode_feature", "_UI_IED_type"),
SclPackage.eINSTANCE.getIED_LNode(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
......
......@@ -64,7 +64,6 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
addInstPropertyDescriptor(object);
addLdNamePropertyDescriptor(object);
addReferredByControlBlockPropertyDescriptor(object);
addLNodePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -135,28 +134,6 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
null));
}
/**
* This adds a property descriptor for the LNode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addLNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LDevice_LNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LDevice_LNode_feature", "_UI_LDevice_type"),
SclPackage.eINSTANCE.getLDevice_LNode(),
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
......@@ -170,8 +147,8 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_AccessControl());
childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_LN());
childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_LN0());
childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_LN());
}
return childrenFeatures;
}
......@@ -232,8 +209,8 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case SclPackage.LDEVICE__ACCESS_CONTROL:
case SclPackage.LDEVICE__LN:
case SclPackage.LDEVICE__LN0:
case SclPackage.LDEVICE__LN:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
......@@ -258,13 +235,13 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
newChildDescriptors.add
(createChildParameter
(SclPackage.eINSTANCE.getLDevice_LN(),
SclFactory.eINSTANCE.createLN()));
(SclPackage.eINSTANCE.getLDevice_LN0(),
SclFactory.eINSTANCE.createLN0()));
newChildDescriptors.add
(createChildParameter
(SclPackage.eINSTANCE.getLDevice_LN0(),
SclFactory.eINSTANCE.createLN0()));
(SclPackage.eINSTANCE.getLDevice_LN(),
SclFactory.eINSTANCE.createLN()));
}
}
......@@ -60,7 +60,6 @@ public class LNItemProvider extends AnyLNItemProvider {
super.getPropertyDescriptors(object);
addPrefixPropertyDescriptor(object);
addLNodePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -87,28 +86,6 @@ public class LNItemProvider extends AnyLNItemProvider {
null));
}
/**
* This adds a property descriptor for the LNode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addLNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LN_LNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LN_LNode_feature", "_UI_LN_type"),
SclPackage.eINSTANCE.getLN_LNode(),
true,
false,
true,
null,
null,
null));
}
/**
* This returns LN.gif.
* <!-- begin-user-doc -->
......
......@@ -65,9 +65,7 @@ public class LNodeItemProvider extends UnNamingItemProvider {
addLnInstPropertyDescriptor(object);
addLnTypePropertyDescriptor(object);
addPrefixPropertyDescriptor(object);
addIEDPropertyDescriptor(object);
addLDevicePropertyDescriptor(object);
addLNPropertyDescriptor(object);
addRefersToAnyLNPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
......@@ -205,63 +203,19 @@ public class LNodeItemProvider extends UnNamingItemProvider {
}
/**
* This adds a property descriptor for the IED feature.
* This adds a property descriptor for the Refers To Any LN feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addIEDPropertyDescriptor(Object object) {
protected void addRefersToAnyLNPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LNode_IED_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LNode_IED_feature", "_UI_LNode_type"),
SclPackage.eINSTANCE.getLNode_IED(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the LDevice feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addLDevicePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LNode_LDevice_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LNode_LDevice_feature", "_UI_LNode_type"),
SclPackage.eINSTANCE.getLNode_LDevice(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the LN feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addLNPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_LNode_LN_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LNode_LN_feature", "_UI_LNode_type"),
SclPackage.eINSTANCE.getLNode_LN(),
getString("_UI_LNode_RefersToAnyLN_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_LNode_RefersToAnyLN_feature", "_UI_LNode_type"),
SclPackage.eINSTANCE.getLNode_RefersToAnyLN(),
true,
false,
true,
......
......@@ -635,6 +635,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredIEDName" ordered="false"
upperBound="-1" eType="#//IEDName" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//IEDName/RefersToAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByLNode" ordered="false"
upperBound="-1" eType="#//LNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNode/RefersToAnyLN"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Association" eSuperTypes="#//BaseElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="associationID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
......@@ -1069,9 +1072,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="AccessPoint" ordered="false"
upperBound="-1" eType="#//AccessPoint" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//AccessPoint/IED"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LNode" ordered="false"
upperBound="-1" eType="#//LNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNode/IED"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="KDC" ordered="false" upperBound="-1"
eType="#//KDC" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//KDC/IED"/>
......@@ -1150,14 +1150,25 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="Server" ordered="false"
eType="#//Server" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Server/LDevice"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LNode" ordered="false"
upperBound="-1" eType="#//LNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNode/LDevice"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN" ordered="false" upperBound="-1"
eType="#//LN" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//LN/LDevice"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN0" ordered="false" eType="#//LN0"
unsettable="true" containment="true" resolveProxies="false" eOpposite="#//LN0/LDevice"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="AnyLN" ordered="false"
upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"
transient="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="group"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN0" eType="#//LN0" volatile="true"
unsettable="true" containment="true" eOpposite="#//LN0/LDevice">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#AnyLN"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN" upperBound="-1" eType="#//LN"
volatile="true" unsettable="true" containment="true" eOpposite="#//LN/LDevice">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#AnyLN"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LN" eSuperTypes="#//AnyLN">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
......@@ -1168,9 +1179,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="LDevice" ordered="false"
eType="#//LDevice" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LDevice/LN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LNode" ordered="false"
upperBound="-1" eType="#//LNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNode/LN"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LN0" eSuperTypes="#//AnyLN">
<eStructuralFeatures xsi:type="ecore:EReference" name="GSEControl" ordered="false"
......@@ -1849,13 +1857,9 @@
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="" unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="IED" ordered="false" eType="#//IED"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//IED/LNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LDevice" ordered="false"
eType="#//LDevice" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LDevice/LNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN" ordered="false" eType="#//LN"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//LN/LNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="RefersToAnyLN" ordered="false"
eType="#//AnyLN" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//AnyLN/ReferredByLNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LNodeContainer" ordered="false"
eType="#//LNodeContainer" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNodeContainer/LNode"/>
......
......@@ -376,6 +376,7 @@
<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/ReferredByLNode"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//Association">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Association/associationID"/>
......@@ -603,7 +604,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IED/owner"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//IED/type"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//IED/AccessPoint"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//IED/LNode"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//IED/KDC"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//IED/Services"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//IED/SCL"/>
......@@ -639,15 +639,14 @@
<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 notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/LNode"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LDevice/LN"/>
<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"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//LN">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LN/prefix"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LN/AccessPoint"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LN/LDevice"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LN/LNode"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//LN0">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//LN0/GSEControl"/>
......@@ -965,9 +964,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LNode/lnInst"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LNode/lnType"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LNode/prefix"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LNode/IED"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LNode/LDevice"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LNode/LN"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//LNode/RefersToAnyLN"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LNode/LNodeContainer"/>
</genClasses>
<genClasses ecoreClass="SCL.ecore#//LNodeContainer">
......
......@@ -45,6 +45,7 @@ import org.eclipse.emf.common.util.EList;
* <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#getReferredByLNode <em>Referred By LNode</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN()
......@@ -772,6 +773,43 @@ public interface AnyLN extends UnNaming {
*/
boolean isSetReferredIEDName();
/**
* Returns the value of the '<em><b>Referred By LNode</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getRefersToAnyLN <em>Refers To Any LN</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Referred By LNode</em>' reference list.
* @see #isSetReferredByLNode()
* @see #unsetReferredByLNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN_ReferredByLNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getRefersToAnyLN
* @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<LNode> getReferredByLNode();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLNode <em>Referred By LNode</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetReferredByLNode()
* @see #getReferredByLNode()
* @generated
*/
void unsetReferredByLNode();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLNode <em>Referred By LNode</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Referred By LNode</em>' reference list is set.
* @see #unsetReferredByLNode()
* @see #getReferredByLNode()
* @generated
*/
boolean isSetReferredByLNode();
LDevice getLDevice();
} // AnyLN
......@@ -37,7 +37,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getOwner <em>Owner</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getType <em>Type</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getAccessPoint <em>Access Point</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getLNode <em>LNode</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getKDC <em>KDC</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getServices <em>Services</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getSCL <em>SCL</em>}</li>
......@@ -462,47 +461,6 @@ public interface IED extends UnNaming {
*/
boolean isSetAccessPoint();
/**
* Returns the value of the '<em><b>LNode</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getIED <em>IED</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>LNode</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>LNode</em>' reference list.
* @see #isSetLNode()
* @see #unsetLNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getIED_LNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getIED
* @model opposite="IED" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<LNode> getLNode();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getLNode <em>LNode</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetLNode()
* @see #getLNode()
* @generated
*/
void unsetLNode();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getLNode <em>LNode</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>LNode</em>' reference list is set.
* @see #unsetLNode()
* @see #getLNode()
* @generated
*/
boolean isSetLNode();
/**
* Returns the value of the '<em><b>KDC</b></em>' containment reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.KDC}.
......
......@@ -20,6 +20,7 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED;
/**
......@@ -36,9 +37,9 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getReferredByControlBlock <em>Referred By Control Block</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getAccessControl <em>Access Control</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getServer <em>Server</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLNode <em>LNode</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLN <em>LN</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getAnyLN <em>Any LN</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLN0 <em>LN0</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLN <em>LN</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLDevice()
......@@ -277,45 +278,17 @@ public interface LDevice extends UnNaming {
void setServer( Server value );
/**
* Returns the value of the '<em><b>LNode</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getLDevice <em>LDevice</em>}'.
* Returns the value of the '<em><b>Any LN</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>LNode</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>LNode</em>' reference list.
* @see #isSetLNode()
* @see #unsetLNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLDevice_LNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getLDevice
* @model opposite="LDevice" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @return the value of the '<em>Any LN</em>' attribute list.
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLDevice_AnyLN()
* @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" ordered="false"
* extendedMetaData="kind='group'"
* @generated
*/
EList<LNode> getLNode();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLNode <em>LNode</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetLNode()
* @see #getLNode()
* @generated
*/
void unsetLNode();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLNode <em>LNode</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>LNode</em>' reference list is set.
* @see #unsetLNode()
* @see #getLNode()
* @generated
*/
boolean isSetLNode();
FeatureMap getAnyLN();
/**
* Returns the value of the '<em><b>LN</b></em>' containment reference list.
......@@ -332,7 +305,8 @@ public interface LDevice extends UnNaming {
* @see #unsetLN()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLDevice_LN()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getLDevice
* @model opposite="LDevice" containment="true" unsettable="true" ordered="false"
* @model opposite="LDevice" containment="true" unsettable="true" volatile="true"
* extendedMetaData="group='#AnyLN'"
* @generated
*/
EList<LN> getLN();
......@@ -373,7 +347,8 @@ public interface LDevice extends UnNaming {
* @see #setLN0(LN0)
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLDevice_LN0()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getLDevice
* @model opposite="LDevice" containment="true" unsettable="true" ordered="false"
* @model opposite="LDevice" containment="true" unsettable="true" volatile="true"
* extendedMetaData="group='#AnyLN'"
* @generated
*/
LN0 getLN0();
......
......@@ -18,8 +18,6 @@
*/
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>LN</b></em>'.
......@@ -32,7 +30,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getPrefix <em>Prefix</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getAccessPoint <em>Access Point</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getLDevice <em>LDevice</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getLNode <em>LNode</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN()
......@@ -150,45 +147,4 @@ public interface LN extends AnyLN {
*/
void setLDevice( LDevice value );
/**
* Returns the value of the '<em><b>LNode</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getLN <em>LN</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>LNode</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>LNode</em>' reference list.
* @see #isSetLNode()
* @see #unsetLNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN_LNode()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getLN
* @model opposite="LN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<LNode> getLNode();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getLNode <em>LNode</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetLNode()
* @see #getLNode()
* @generated
*/
void unsetLNode();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN#getLNode <em>LNode</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether th