Commit 12727723 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '22-the-connectivitynode-of-a-terminal-may-be-in-a-line' into 'master'

Resolve "The ConnectivityNode of a Terminal may be in a Line"

Closes #22

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!20
parents 4273bb93 7fa395c7
...@@ -1047,3 +1047,5 @@ _UI_McSecurity_SMVSettings_feature = SMV Settings ...@@ -1047,3 +1047,5 @@ _UI_McSecurity_SMVSettings_feature = SMV Settings
_UI_McSecurity_signature_feature = Signature _UI_McSecurity_signature_feature = Signature
_UI_McSecurity_encryption_feature = Encryption _UI_McSecurity_encryption_feature = Encryption
_UI_GSESettings_kdaParticipant_feature = Kda Participant _UI_GSESettings_kdaParticipant_feature = Kda Participant
_UI_ConnectivityNode_ReferredByTerminal_feature = Referred By Terminal
_UI_Terminal_RefersToConnectivityNode_feature = Refers To Connectivity Node
...@@ -24,7 +24,6 @@ import java.util.List; ...@@ -24,7 +24,6 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.emf.edit.provider.ViewerNotification;
...@@ -60,33 +59,10 @@ public class BayItemProvider extends EquipmentContainerItemProvider { ...@@ -60,33 +59,10 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
if (itemPropertyDescriptors == null) { if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addTerminalPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
/**
* This adds a property descriptor for the Terminal feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addTerminalPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Bay_Terminal_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Bay_Terminal_feature", "_UI_Bay_type"),
SclPackage.eINSTANCE.getBay_Terminal(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
......
...@@ -60,7 +60,7 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider { ...@@ -60,7 +60,7 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addPathNamePropertyDescriptor(object); addPathNamePropertyDescriptor(object);
addTerminalPropertyDescriptor(object); addReferredByTerminalPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -88,19 +88,19 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider { ...@@ -88,19 +88,19 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
} }
/** /**
* This adds a property descriptor for the Terminal feature. * This adds a property descriptor for the Referred By Terminal feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addTerminalPropertyDescriptor(Object object) { protected void addReferredByTerminalPropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_ConnectivityNode_Terminal_feature"), getString("_UI_ConnectivityNode_ReferredByTerminal_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_ConnectivityNode_Terminal_feature", "_UI_ConnectivityNode_type"), getString("_UI_PropertyDescriptor_description", "_UI_ConnectivityNode_ReferredByTerminal_feature", "_UI_ConnectivityNode_type"),
SclPackage.eINSTANCE.getConnectivityNode_Terminal(), SclPackage.eINSTANCE.getConnectivityNode_ReferredByTerminal(),
true, true,
false, false,
true, true,
......
...@@ -24,7 +24,6 @@ import java.util.List; ...@@ -24,7 +24,6 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.emf.edit.provider.ViewerNotification;
...@@ -60,33 +59,10 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider { ...@@ -60,33 +59,10 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
if (itemPropertyDescriptors == null) { if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addTerminalPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
/**
* This adds a property descriptor for the Terminal feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addTerminalPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Substation_Terminal_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Substation_Terminal_feature", "_UI_Substation_type"),
SclPackage.eINSTANCE.getSubstation_Terminal(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
......
...@@ -65,10 +65,7 @@ public class TerminalItemProvider extends UnNamingItemProvider { ...@@ -65,10 +65,7 @@ public class TerminalItemProvider extends UnNamingItemProvider {
addProcessNamePropertyDescriptor(object); addProcessNamePropertyDescriptor(object);
addSubstationNamePropertyDescriptor(object); addSubstationNamePropertyDescriptor(object);
addVoltageLevelNamePropertyDescriptor(object); addVoltageLevelNamePropertyDescriptor(object);
addBayPropertyDescriptor(object); addRefersToConnectivityNodePropertyDescriptor(object);
addCNodePropertyDescriptor(object);
addSubstationPropertyDescriptor(object);
addVoltageLevelPropertyDescriptor(object);
addNamePropertyDescriptor(object); addNamePropertyDescriptor(object);
addLineNamePropertyDescriptor(object); addLineNamePropertyDescriptor(object);
} }
...@@ -208,19 +205,19 @@ public class TerminalItemProvider extends UnNamingItemProvider { ...@@ -208,19 +205,19 @@ public class TerminalItemProvider extends UnNamingItemProvider {
} }
/** /**
* This adds a property descriptor for the Bay feature. * This adds a property descriptor for the Refers To Connectivity Node feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addBayPropertyDescriptor(Object object) { protected void addRefersToConnectivityNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_Terminal_Bay_feature"), getString("_UI_Terminal_RefersToConnectivityNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Terminal_Bay_feature", "_UI_Terminal_type"), getString("_UI_PropertyDescriptor_description", "_UI_Terminal_RefersToConnectivityNode_feature", "_UI_Terminal_type"),
SclPackage.eINSTANCE.getTerminal_Bay(), SclPackage.eINSTANCE.getTerminal_RefersToConnectivityNode(),
true, true,
false, false,
true, true,
...@@ -230,72 +227,6 @@ public class TerminalItemProvider extends UnNamingItemProvider { ...@@ -230,72 +227,6 @@ public class TerminalItemProvider extends UnNamingItemProvider {
} }
/** /**
* This adds a property descriptor for the CNode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addCNodePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Terminal_cNode_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Terminal_cNode_feature", "_UI_Terminal_type"),
SclPackage.eINSTANCE.getTerminal_CNode(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Substation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addSubstationPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Terminal_Substation_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Terminal_Substation_feature", "_UI_Terminal_type"),
SclPackage.eINSTANCE.getTerminal_Substation(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Voltage Level feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addVoltageLevelPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Terminal_VoltageLevel_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Terminal_VoltageLevel_feature", "_UI_Terminal_type"),
SclPackage.eINSTANCE.getTerminal_VoltageLevel(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Name feature. * This adds a property descriptor for the Name feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
......
...@@ -63,7 +63,6 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider { ...@@ -63,7 +63,6 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
addNomFreqPropertyDescriptor(object); addNomFreqPropertyDescriptor(object);
addNumPhasesPropertyDescriptor(object); addNumPhasesPropertyDescriptor(object);
addTerminalPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -113,28 +112,6 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider { ...@@ -113,28 +112,6 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
} }
/** /**
* This adds a property descriptor for the Terminal feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addTerminalPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_VoltageLevel_Terminal_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_VoltageLevel_Terminal_feature", "_UI_VoltageLevel_type"),
SclPackage.eINSTANCE.getVoltageLevel_Terminal(),
true,
false,
true,
null,
null,
null));
}
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
......
...@@ -1700,9 +1700,6 @@ ...@@ -1700,9 +1700,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ConnectivityNode" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ConnectivityNode" ordered="false"
upperBound="-1" eType="#//ConnectivityNode" unsettable="true" containment="true" upperBound="-1" eType="#//ConnectivityNode" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//ConnectivityNode/Bay"/> resolveProxies="false" eOpposite="#//ConnectivityNode/Bay"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Terminal" ordered="false"
upperBound="-1" eType="#//Terminal" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Terminal/Bay"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ConductingEquipment" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ConductingEquipment" ordered="false"
upperBound="-1" eType="#//ConductingEquipment" unsettable="true" containment="true" upperBound="-1" eType="#//ConductingEquipment" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//ConductingEquipment/Bay"/> resolveProxies="false" eOpposite="#//ConductingEquipment/Bay"/>
...@@ -1732,9 +1729,9 @@ ...@@ -1732,9 +1729,9 @@
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Bay" ordered="false" eType="#//Bay" <eStructuralFeatures xsi:type="ecore:EReference" name="Bay" ordered="false" eType="#//Bay"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Bay/ConnectivityNode"/> transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Bay/ConnectivityNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Terminal" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="ReferredByTerminal" ordered="false"
upperBound="-1" eType="#//Terminal" transient="true" unsettable="true" resolveProxies="false" upperBound="-1" eType="#//Terminal" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Terminal/cNode"/> eOpposite="#//Terminal/RefersToConnectivityNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Line" ordered="false" eType="#//Line" <eStructuralFeatures xsi:type="ecore:EReference" name="Line" ordered="false" eType="#//Line"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Line/ConnectivityNode"/> transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Line/ConnectivityNode"/>
</eClassifiers> </eClassifiers>
...@@ -1921,9 +1918,6 @@ ...@@ -1921,9 +1918,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="VoltageLevel" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="VoltageLevel" ordered="false"
upperBound="-1" eType="#//VoltageLevel" unsettable="true" containment="true" upperBound="-1" eType="#//VoltageLevel" unsettable="true" containment="true"
resolveProxies="false" eOpposite="#//VoltageLevel/Substation"/> resolveProxies="false" eOpposite="#//VoltageLevel/Substation"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Terminal" ordered="false"
upperBound="-1" eType="#//Terminal" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Terminal/Substation"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Process" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="Process" ordered="false"
eType="#//Process" transient="true" unsettable="true" resolveProxies="false" eType="#//Process" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Process/Substation"/> eOpposite="#//Process/Substation"/>
...@@ -1961,17 +1955,9 @@ ...@@ -1961,17 +1955,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="AbstractConductingEquipment" <eStructuralFeatures xsi:type="ecore:EReference" name="AbstractConductingEquipment"
ordered="false" eType="#//AbstractConductingEquipment" transient="true" unsettable="true" ordered="false" eType="#//AbstractConductingEquipment" transient="true" unsettable="true"
resolveProxies="false" eOpposite="#//AbstractConductingEquipment/Terminal"/> resolveProxies="false" eOpposite="#//AbstractConductingEquipment/Terminal"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Bay" ordered="false" eType="#//Bay" <eStructuralFeatures xsi:type="ecore:EReference" name="RefersToConnectivityNode"
transient="true" unsettable="true" resolveProxies="false" eOpposite="#//Bay/Terminal"/> ordered="false" eType="#//ConnectivityNode" transient="true" unsettable="true"
<eStructuralFeatures xsi:type="ecore:EReference" name="cNode" ordered="false" resolveProxies="false" eOpposite="#//ConnectivityNode/ReferredByTerminal"/>
eType="#//ConnectivityNode" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//ConnectivityNode/Terminal"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Substation" ordered="false"
eType="#//Substation" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Substation/Terminal"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="VoltageLevel" ordered="false"
eType="#//VoltageLevel" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//VoltageLevel/Terminal"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
unsettable="true"/> unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="lineName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
...@@ -2016,9 +2002,6 @@ ...@@ -2016,9 +2002,6 @@
eOpposite="#//Substation/VoltageLevel"/> eOpposite="#//Substation/VoltageLevel"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Voltage" ordered="false" <eStructuralFeatures xsi:type="ecore:EReference" name="Voltage" ordered="false"
eType="#//Voltage" unsettable="true" containment="true" resolveProxies="false"/> eType="#//Voltage" unsettable="true" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="Terminal" ordered="false"
upperBound="-1" eType="#//Terminal" transient="true" unsettable="true" resolveProxies="false"
eOpposite="#//Terminal/VoltageLevel"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="AssociationKindEnum"> <eClassifiers xsi:type="ecore:EEnum" name="AssociationKindEnum">
<eLiterals name="pre_established"/> <eLiterals name="pre_established"/>
......
...@@ -898,7 +898,6 @@ ...@@ -898,7 +898,6 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Bay/VoltageLevel"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Bay/VoltageLevel"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/Function"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/Function"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/ConnectivityNode"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/ConnectivityNode"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/Terminal"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/ConductingEquipment"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Bay/ConductingEquipment"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//ConductingEquipment"> <genClasses ecoreClass="SCL.ecore#//ConductingEquipment">
...@@ -913,7 +912,7 @@ ...@@ -913,7 +912,7 @@
<genClasses ecoreClass="SCL.ecore#//ConnectivityNode"> <genClasses ecoreClass="SCL.ecore#//ConnectivityNode">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//ConnectivityNode/pathName"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//ConnectivityNode/pathName"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/Bay"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/Bay"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/Terminal"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/ReferredByTerminal"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/Line"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//ConnectivityNode/Line"/>
</genClasses> </genClasses>
<genClasses ecoreClass="SCL.ecore#//EqFunction"> <genClasses ecoreClass="SCL.ecore#//EqFunction">
...@@ -1001,7 +1000,6 @@ ...@@ -1001,7 +1000,6 @@
<genClasses ecoreClass="SCL.ecore#//Substation"> <genClasses ecoreClass="SCL.ecore#//Substation">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Substation/Function"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Substation/Function"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Substation/VoltageLevel"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//Substation/VoltageLevel"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Substation/Terminal"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Substation/Process"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Substation/Process"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Substation/SCL"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Substation/SCL"/>
</genClasses> </genClasses>
...@@ -1020,10 +1018,7 @@ ...@@ -1020,10 +1018,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/substationName"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/substationName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/voltageLevelName"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/voltageLevelName"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/AbstractConductingEquipment"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/AbstractConductingEquipment"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/Bay"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/RefersToConnectivityNode"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/cNode"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/Substation"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//Terminal/VoltageLevel"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/lineName"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SCL.ecore#//Terminal/lineName"/>
</genClasses> </genClasses>
...@@ -1044,7 +1039,6 @@ ...@@ -1044,7 +1039,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Function"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Function"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Substation"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Substation"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Voltage"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Voltage"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SCL.ecore#//VoltageLevel/Terminal"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="SCL.ecore#//ExplicitLinkResolver"/> <genClasses image="false" ecoreClass="SCL.ecore#//ExplicitLinkResolver"/>
<genClasses image="false" ecoreClass="SCL.ecore#//DataObject"> <genClasses image="false" ecoreClass="SCL.ecore#//DataObject">
......
...@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList; ...@@ -32,7 +32,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getVoltageLevel <em>Voltage Level</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getVoltageLevel <em>Voltage Level</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getFunction <em>Function</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getFunction <em>Function</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConnectivityNode <em>Connectivity Node</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConnectivityNode <em>Connectivity Node</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getTerminal <em>Terminal</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConductingEquipment <em>Conducting Equipment</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConductingEquipment <em>Conducting Equipment</em>}</li>
* </ul> * </ul>
* *
...@@ -151,47 +150,6 @@ public interface Bay extends EquipmentContainer { ...@@ -151,47 +150,6 @@ public interface Bay extends EquipmentContainer {
*/ */
boolean isSetConnectivityNode(); boolean isSetConnectivityNode();
/**
* Returns the value of the '<em><b>Terminal</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getBay <em>Bay</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Terminal</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Terminal</em>' reference list.
* @see #isSetTerminal()
* @see #unsetTerminal()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getBay_Terminal()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getBay
* @model opposite="Bay" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated
*/
EList<Terminal> getTerminal();
/**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getTerminal <em>Terminal</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #isSetTerminal()
* @see #getTerminal()
* @generated
*/
void unsetTerminal();
/**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getTerminal <em>Terminal</em>}' reference list is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return whether the value of the '<em>Terminal</em>' reference list is set.
* @see #unsetTerminal()
* @see #getTerminal()
* @generated
*/
boolean isSetTerminal();
/** /**
* Returns the value of the '<em><b>Conducting Equipment</b></em>' containment reference list. * Returns the value of the '<em><b>Conducting Equipment</b></em>' containment reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConductingEquipment}. * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConductingEquipment}.
......
...@@ -31,7 +31,7 @@ import org.eclipse.emf.common.util.EList; ...@@ -31,7 +31,7 @@ import org.eclipse.emf.common.util.EList;
* <ul> * <ul>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getPathName <em>Path Name</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getPathName <em>Path Name</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getBay <em>Bay</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getBay <em>Bay</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getTerminal <em>Terminal</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getReferredByTerminal <em>Referred By Terminal</em>}</li>
* <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getLine <em>Line</em>}</li> * <li>{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getLine <em>Line</em>}</li>
* </ul> * </ul>
* *
...@@ -122,45 +122,45 @@ public interface ConnectivityNode extends LNodeContainer { ...@@ -122,45 +122,45 @@ public interface ConnectivityNode extends LNodeContainer {
void setBay( Bay value ); void setBay( Bay value );
/** /**
* Returns the value of the '<em><b>Terminal</b></em>' reference list. * Returns the value of the '<em><b>Referred By Terminal</b></em>' reference list.
* The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal}. * The list contents are of type {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal}.
* It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getCNode <em>CNode</em>}'. * It is bidirectional and its opposite is '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getRefersToConnectivityNode <em>Refers To Connectivity Node</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <p> * <p>
* If the meaning of the '<em>Terminal</em>' reference isn't clear, * If the meaning of the '<em>Referred By Terminal</em>' reference list isn't clear,
* there really should be more of a description here... * there really should be more of a description here...
* </p> * </p>
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Terminal</em>' reference list. * @return the value of the '<em>Referred By Terminal</em>' reference list.
* @see #isSetTerminal() * @see #isSetReferredByTerminal()
* @see #unsetTerminal() * @see #unsetReferredByTerminal()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectivityNode_Terminal() * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getConnectivityNode_ReferredByTerminal()
* @see fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getCNode * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getRefersToConnectivityNode
* @model opposite="cNode" resolveProxies="false" unsettable="true" transient="true" ordered="false" * @model opposite="RefersToConnectivityNode" resolveProxies="false" unsettable="true" transient="true" ordered="false"
* @generated * @generated
*/ */
EList<Terminal> getTerminal(); EList<Terminal> getReferredByTerminal();
/** /**
* Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getTerminal <em>Terminal</em>}' reference list. * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getReferredByTerminal <em>Referred By Terminal</em>}' reference list.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #isSetTerminal() * @see #isSetReferredByTerminal()
* @see #getTerminal() * @see #getReferredByTerminal()
* @generated * @generated
*/ */
void unsetTerminal(); void unsetReferredByTerminal();
/** /**
* Returns whether the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getTerminal <em>Terminal</em>}' reference list is set.