Commit 8594ebb0 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '63-logcontrol-in-ln0-are-displayed-twice' into 'master'

Resolve "LogControl in LN0 are displayed twice"

Closes #63

See merge request !61
parents 8017695c 936feb0c
Pipeline #5165 passed with stages
in 37 seconds
......@@ -174,7 +174,6 @@ 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,7 +236,6 @@ 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;
}
......
......@@ -258,26 +258,11 @@
upperBound="-1" eType="#//PhysConn" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//PhysConn/ParentConnectedAP"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="GSE" ordered="false" upperBound="-1"
eType="#//GSE" volatile="true" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//GSE/ParentConnectedAP">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlBlock"/>
</eAnnotations>
</eStructuralFeatures>
eType="#//GSE" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//GSE/ParentConnectedAP"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="SMV" ordered="false" upperBound="-1"
eType="#//SMV" volatile="true" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//SMV/ParentConnectedAP">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlBlock"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ControlBlock" 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>
eType="#//SMV" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//SMV/ParentConnectedAP"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ControlBlock" abstract="true" eSuperTypes="#//UnNaming">
<eOperations name="getParentConnectedAP" eType="#//ConnectedAP"/>
......@@ -622,19 +607,11 @@
eType="#//DOI" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//DOI/ParentAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReportControl" ordered="false"
upperBound="-1" eType="#//ReportControl" volatile="true" unsettable="true"
containment="true" resolveProxies="false" eOpposite="#//ReportControl/ParentAnyLN">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlWithTriggerOpt"/>
</eAnnotations>
</eStructuralFeatures>
upperBound="-1" eType="#//ReportControl" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//ReportControl/ParentAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LogControl" ordered="false"
upperBound="-1" eType="#//LogControl" volatile="true" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//LogControl/ParentAnyLN">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlWithTriggerOpt"/>
</eAnnotations>
</eStructuralFeatures>
upperBound="-1" eType="#//LogControl" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//LogControl/ParentAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="DataSet" ordered="false"
upperBound="-1" eType="#//DataSet" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//DataSet/ParentAnyLN"/>
......@@ -653,13 +630,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByLNode" ordered="false"
upperBound="-1" eType="#//LNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LNode/RefersToAnyLN"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ControlWithTriggerOpt"
ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"
transient="true" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="group"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Association" eSuperTypes="#//BaseElement #//AgLNRef">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="associationID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
......@@ -1154,25 +1124,11 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ParentServer" ordered="false"
eType="#//Server" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Server/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" ordered="false" eType="#//LN0"
volatile="true" unsettable="true" containment="true" eOpposite="#//LN0/ParentLDevice">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#AnyLN"/>
</eAnnotations>
</eStructuralFeatures>
unsettable="true" containment="true" resolveProxies="false" eOpposite="#//LN0/ParentLDevice"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="LN" ordered="false" upperBound="-1"
eType="#//LN" volatile="true" unsettable="true" containment="true" eOpposite="#//LN/ParentLDevice">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#AnyLN"/>
</eAnnotations>
</eStructuralFeatures>
eType="#//LN" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//LN/ParentLDevice"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByIEDName" ordered="false"
eType="#//IEDName" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//IEDName/RefersToLDevice"/>
......@@ -1195,32 +1151,17 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LN0" eSuperTypes="#//AnyLN">
<eStructuralFeatures xsi:type="ecore:EReference" name="GSEControl" ordered="false"
upperBound="-1" eType="#//GSEControl" volatile="true" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//GSEControl/ParentLN0">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlWithIEDName"/>
</eAnnotations>
</eStructuralFeatures>
upperBound="-1" eType="#//GSEControl" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//GSEControl/ParentLN0"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ParentLDevice" ordered="false"
eType="#//LDevice" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//LDevice/LN0"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="SampledValueControl" ordered="false"
upperBound="-1" eType="#//SampledValueControl" volatile="true" unsettable="true"
containment="true" resolveProxies="false" eOpposite="#//SampledValueControl/ParentLN0">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="group" value="#ControlWithIEDName"/>
</eAnnotations>
</eStructuralFeatures>
upperBound="-1" eType="#//SampledValueControl" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//SampledValueControl/ParentLN0"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="SettingControl" ordered="false"
eType="#//SettingControl" unsettable="true" containment="true" resolveProxies="false"
eOpposite="#//SettingControl/ParentLN0"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ControlWithIEDName" ordered="false"
upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"
transient="true" unsettable="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="group"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Log" eSuperTypes="#//UnNaming">
<eStructuralFeatures xsi:type="ecore:EReference" name="ParentAnyLN" ordered="false"
......
......@@ -214,7 +214,6 @@
<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"/>
......@@ -374,7 +373,6 @@
<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/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"/>
<genOperations ecoreOperation="SCL.ecore#//AnyLN/getParentLDevice"/>
<genOperations ecoreOperation="SCL.ecore#//AnyLN/getNamespace"/>
</genClasses>
......@@ -630,7 +628,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//LDevice/ldName"/>
<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/ParentServer"/>
<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"/>
......@@ -648,7 +645,6 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//LN0/ParentLDevice"/>
<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/ParentAnyLN"/>
......
......@@ -21,7 +21,6 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
/**
* <!-- begin-user-doc -->
......@@ -47,7 +46,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <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#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>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getAnyLN()
......@@ -421,8 +419,7 @@ 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#getParentAnyLN
* @model opposite="ParentAnyLN" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithTriggerOpt'"
* @model opposite="ParentAnyLN" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< ReportControl > getReportControl();
......@@ -463,8 +460,7 @@ 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#getParentAnyLN
* @model opposite="ParentAnyLN" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithTriggerOpt'"
* @model opposite="ParentAnyLN" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< LogControl > getLogControl();
......@@ -728,42 +724,6 @@ 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" ordered="false"
* extendedMetaData="kind='group'"
* @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();
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
......@@ -21,7 +21,6 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
/**
* <!-- begin-user-doc -->
......@@ -41,7 +40,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <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,8 +396,7 @@ 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#getParentConnectedAP
* @model opposite="ParentConnectedAP" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlBlock'"
* @model opposite="ParentConnectedAP" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< GSE > getGSE();
......@@ -440,8 +437,7 @@ 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#getParentConnectedAP
* @model opposite="ParentConnectedAP" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlBlock'"
* @model opposite="ParentConnectedAP" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< SMV > getSMV();
......@@ -467,17 +463,4 @@ 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
......@@ -21,8 +21,6 @@
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;
/**
......@@ -38,7 +36,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLdName <em>Ld Name</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#getParentServer <em>Parent Server</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>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getReferredByIEDName <em>Referred By IED Name</em>}</li>
......@@ -236,19 +233,6 @@ public interface LDevice extends UnNaming {
*/
void setParentServer( Server value );
/**
* 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 -->
* <!-- end-user-doc -->
* @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
*/
FeatureMap getAnyLN();
/**
* Returns the value of the '<em><b>LN</b></em>' containment reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN}.
......@@ -264,8 +248,7 @@ 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#getParentLDevice
* @model opposite="ParentLDevice" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#AnyLN'"
* @model opposite="ParentLDevice" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< LN > getLN();
......@@ -453,8 +436,7 @@ 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#getParentLDevice
* @model opposite="ParentLDevice" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#AnyLN'"
* @model opposite="ParentLDevice" containment="true" unsettable="true" ordered="false"
* @generated
*/
LN0 getLN0();
......
......@@ -21,7 +21,6 @@
package fr.centralesupelec.edf.riseclipse.iec61850.scl;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.FeatureMap;
/**
* <!-- begin-user-doc -->
......@@ -36,7 +35,6 @@ import org.eclipse.emf.ecore.util.FeatureMap;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getParentLDevice <em>Parent LDevice</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getSampledValueControl <em>Sampled Value Control</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getSettingControl <em>Setting Control</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getControlWithIEDName <em>Control With IED Name</em>}</li>
* </ul>
*
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN0()
......@@ -59,8 +57,7 @@ public interface LN0 extends AnyLN {
* @see #unsetGSEControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN0_GSEControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.GSEControl#getParentLN0
* @model opposite="ParentLN0" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithIEDName'"
* @model opposite="ParentLN0" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< GSEControl > getGSEControl();
......@@ -126,8 +123,7 @@ public interface LN0 extends AnyLN {
* @see #unsetSampledValueControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN0_SampledValueControl()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SampledValueControl#getParentLN0
* @model opposite="ParentLN0" containment="true" unsettable="true" volatile="true" ordered="false"
* extendedMetaData="group='#ControlWithIEDName'"
* @model opposite="ParentLN0" containment="true" unsettable="true" ordered="false"
* @generated
*/
EList< SampledValueControl > getSampledValueControl();
......@@ -208,40 +204,4 @@ public interface LN0 extends AnyLN {
*/
boolean isSetSettingControl();
/**
* Returns the value of the '<em><b>Control With IED Name</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 IED Name</em>' attribute list.
* @see #isSetControlWithIEDName()
* @see #unsetControlWithIEDName()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getLN0_ControlWithIEDName()
* @model unsettable="true" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" transient="true" ordered="false"
* extendedMetaData="kind='group'"
* @generated
*/
FeatureMap getControlWithIEDName();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getControlWithIEDName <em>Control With IED Name</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetControlWithIEDName()
* @see #getControlWithIEDName()
* @generated
*/
void unsetControlWithIEDName();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getControlWithIEDName <em>Control With IED Name</em>}' attribute list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Control With IED Name</em>' attribute list is set.
* @see #unsetControlWithIEDName()
* @see #getControlWithIEDName()
* @generated
*/
boolean isSetControlWithIEDName();
} // LN0
......@@ -3702,15 +3702,6 @@ public interface SclPackage extends EPackage {
*/
int CONNECTED_AP__SMV = UN_NAMING_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Control Block</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int CONNECTED_AP__CONTROL_BLOCK = UN_NAMING_FEATURE_COUNT + 9;
/**
* The number of structural features of the '<em>Connected AP</em>' class.
* <!-- begin-user-doc -->
......@@ -3718,7 +3709,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int CONNECTED_AP_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 10;
int CONNECTED_AP_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 9;
/**
* The operation id for the '<em>Build Explicit Links</em>' operation.
......@@ -7197,15 +7188,6 @@ public interface SclPackage extends EPackage {
*/
int ANY_LN__REFERRED_BY_LNODE = UN_NAMING_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Control With Trigger Opt</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int ANY_LN__CONTROL_WITH_TRIGGER_OPT = UN_NAMING_FEATURE_COUNT + 15;
/**
* The number of structural features of the '<em>Any LN</em>' class.
* <!-- begin-user-doc -->
......@@ -7213,7 +7195,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int ANY_LN_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 16;
int ANY_LN_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 15;
/**
* The operation id for the '<em>Build Explicit Links</em>' operation.
......@@ -12415,15 +12397,6 @@ public interface SclPackage extends EPackage {
*/
int LDEVICE__PARENT_SERVER = UN_NAMING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Any LN</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int LDEVICE__ANY_LN = UN_NAMING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>LN0</b></em>' containment reference.
* <!-- begin-user-doc -->
......@@ -12431,7 +12404,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE__LN0 = UN_NAMING_FEATURE_COUNT + 5;
int LDEVICE__LN0 = UN_NAMING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>LN</b></em>' containment reference list.
......@@ -12440,7 +12413,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE__LN = UN_NAMING_FEATURE_COUNT + 6;
int LDEVICE__LN = UN_NAMING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Referred By IED Name</b></em>' reference.
......@@ -12449,7 +12422,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE__REFERRED_BY_IED_NAME = UN_NAMING_FEATURE_COUNT + 7;
int LDEVICE__REFERRED_BY_IED_NAME = UN_NAMING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Refers To Higher Level LDevice</b></em>' reference.
......@@ -12458,7 +12431,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE__REFERS_TO_HIGHER_LEVEL_LDEVICE = UN_NAMING_FEATURE_COUNT + 8;
int LDEVICE__REFERS_TO_HIGHER_LEVEL_LDEVICE = UN_NAMING_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Refers To Lower Level LDevices</b></em>' reference list.
......@@ -12467,7 +12440,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE__REFERS_TO_LOWER_LEVEL_LDEVICES = UN_NAMING_FEATURE_COUNT + 9;
int LDEVICE__REFERS_TO_LOWER_LEVEL_LDEVICES = UN_NAMING_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>LDevice</em>' class.
......@@ -12476,7 +12449,7 @@ public interface SclPackage extends EPackage {
* @generated
* @ordered
*/
int LDEVICE_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 10;
int LDEVICE_FEATURE_COUNT = UN_NAMING_FEATURE_COUNT + 9;
/**
* The operation id for the '<em>Build Explicit Links</em>' operation.
......@@ -12703,15 +12676,6 @@ public interface SclPackage extends EPackage {
*/
int LN__REFERRED_BY_LNODE = ANY_LN__REFERRED_BY_LNODE;
/**
* The feature id for the '<em><b>Control With Trigger Opt</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int LN__CONTROL_WITH_TRIGGER_OPT = ANY_LN__CONTROL_WITH_TRIGGER_OPT;
/**
* The feature id for the '<em><b>Prefix</b></em>' attribute.
* <!-- begin-user-doc -->
......@@ -12982,15 +12946,6 @@ public interface SclPackage extends EPackage {
*/
int LN0__REFERRED_BY_LNODE = ANY_LN__REFERRED_BY_LNODE;
/**
* The feature id for the '<em><b>Control With Trigger Opt</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int LN0__CONTROL_WITH_TRIGGER_OPT = ANY_LN__CONTROL_WITH_TRIGGER_OPT;
/**
* The feature id for the '<em><b>GSE Control</b></em>' containment reference list.
* <!-- begin-user-doc -->
......@@ -13027,15 +12982,6 @@ public interface SclPackage extends EPackage {
*/
int LN0__SETTING_CONTROL = ANY_LN_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Control With IED Name</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated